March 2018 - openSUSE Commits - openSUSE Mailing Lists

commit keepassxc for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '18

02 Mar '18

Hello community, here is the log from the commit of package keepassxc for openSUSE:Factory checked in at 2018-03-02 21:10:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/keepassxc (Old) and /work/SRC/openSUSE:Factory/.keepassxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "keepassxc" Fri Mar 2 21:10:17 2018 rev:8 rq:580987 version:2.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/keepassxc/keepassxc.changes 2017-12-15 14:07:23.086825275 +0100 +++ /work/SRC/openSUSE:Factory/.keepassxc.new/keepassxc.changes 2018-03-02 21:10:18.731952759 +0100 @@ -1,0 +2,111 @@ +Wed Feb 28 13:31:24 UTC 2018 - mrueckert(a)suse.de + +- also offer the uncompressed svg icons for desktop environments + which dont support compressed icons. The program uses the .svgz + internally so we keep them around. + +------------------------------------------------------------------- +Wed Feb 28 13:09:09 UTC 2018 - mrueckert(a)suse.de + +- if we kill the post/postun scriptlets we can also remove the + related requires from the package + +------------------------------------------------------------------- +Wed Feb 28 11:55:36 UTC 2018 - mpluskal(a)suse.com + +- Mark license as such +- Convert more dependencies to pkgconfig() style + +------------------------------------------------------------------- +Wed Feb 28 00:16:40 UTC 2018 - mrueckert(a)suse.de + +- Drop the post/postun scriptlets as they are a noop on TW/Leap + 15.0 and we can't build on older distros anymore. + This fixes a warning about empty scriptlets. + +------------------------------------------------------------------- +Wed Feb 28 00:11:19 UTC 2018 - mrueckert(a)suse.de + +- use -DWITH_XC_ALL=ON instead of enabling all features manually + - this brings back the old HTTP based extension support for a + graceful migration for users. + +------------------------------------------------------------------- +Tue Feb 27 23:35:00 UTC 2018 - mrueckert(a)suse.de + +- update to 2.3.0 + - Add support for KDBX 4.0, Argon2 and ChaCha20 [#148, #1179, + #1230, #1494] + - Add SSH Agent feature [#1098, #1450, #1463] + - Add preview panel with details of the selected entry [#879, + #1338] + - Add more and configurable columns to entry table and allow + copying of values by double click [#1305] + - Add KeePassXC-Browser API as a replacement for KeePassHTTP + [#608] + - Deprecate KeePassHTTP [#1392] + - Add support for Steam one-time passwords [#1206] + - Add support for multiple Auto-Type sequences for a single entry + [#1390] + - Adjust YubiKey HMAC-SHA1 challenge-response key generation for + KDBX 4.0 [#1060] + - Replace qHttp with cURL for website icon downloads [#1460] + - Remove lock file [#1231] + - Add option to create backup file before saving [#1385] + - Ask to save a generated password before closing the entry + password generator [#1499] + - Resolve placeholders recursively [#1078] + - Add Auto-Type button to the toolbar [#1056] + - Improve window focus handling for Auto-Type dialogs [#1204, + #1490] + - Auto-Type dialog and password generator can now be exited with + ESC [#1252, #1412] + - Add optional dark tray icon [#1154] + - Add new "Unsafe saving" option to work around saving problems + with file sync services [#1385] + - Add IBus support to AppImage and additional image formats to + Windows builds [#1534, #1537] + - Add diceware password generator to CLI [#1406] + - Add --key-file option to CLI [#816, #824] + - Add DBus interface for opening and closing KeePassXC databases + [#283] + - Add KDBX compression options to database settings [#1419] + - Discourage use of old fixed-length key files in favor of + arbitrary files [#1326, #1327] + - Correct reference resolution in entry fields [#1486] + - Fix window state and recent databases not being remembered on + exit [#1453] + - Correct history item generation when configuring TOTP for an + entry [#1446] + - Correct multiple TOTP bugs [#1414] + - Automatic saving after every change is now a default [#279] + - Allow creation of new entries during search [#1398] + - Correct menu issues on macOS [#1335] + - Allow compilation on OpenBSD [#1328] + - Improve entry attachments view [#1139, #1298] + - Fix auto lock for Gnome and Xfce [#910, #1249] + - Don't remember key files in file dialogs when the setting is + disabled [#1188] + - Improve database merging and conflict resolution [#807, #1165] + - Fix macOS pasteboard issues [#1202] + - Improve startup times on some platforms [#1205] + - Hide the notes field by default [#1124] + - Toggle main window by clicking tray icon with the middle mouse + button [#992] + - Fix custom icons not copied over when databases are merged + [#1008] + - Allow use of DEL key to delete entries [#914] + - Correct intermittent crash due to stale history items [#1527] + - Sanitize newline characters in title, username and URL fields + [#1502] + - Reopen previously opened databases in correct order [#774] + - Use system's zxcvbn library if available [#701] + - Implement various i18n improvements [#690, #875, #1436] +- bump BR for libgcrypt-devel to >= 1.7 as required by the update +- BR libargon2, libcurl and libsodium for the new features +- enable new browser integration mode, ssh-agent, dbus and + networking support +- disable old style browser support +- cleanup filelist + +------------------------------------------------------------------- Old: ---- keepassxc-2.2.4-src.tar.xz keepassxc-2.2.4-src.tar.xz.sig New: ---- keepassxc-2.3.0-src.tar.xz keepassxc-2.3.0-src.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keepassxc.spec ++++++ --- /var/tmp/diff_new_pack.zA6HAo/_old 2018-03-02 21:10:19.855912340 +0100 +++ /var/tmp/diff_new_pack.zA6HAo/_new 2018-03-02 21:10:19.867911909 +0100 @@ -1,7 +1,7 @@ # # spec file for package keepassxc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,20 @@ Name: keepassxc -Version: 2.2.4 +Version: 2.3.0 Release: 0 Summary: Qt5-based Password Manager -License: GPL-2.0 OR GPL-3.0 +License: GPL-2.0-only OR GPL-3.0-only Group: Productivity/Security -URL: https://www.keepassxc.org/ +Url: https://www.keepassxc.org/ Source0: https://github.com/keepassxreboot/keepassxc/releases/download/%{version}/ke… Source1: https://github.com/keepassxreboot/keepassxc/releases/download/%{version}/ke… Source2: https://keepassxc.org/keepassxc_master_signing_key.asc#/%{name}.keyring BuildRequires: cmake >= 3.1.0 BuildRequires: fdupes BuildRequires: hicolor-icon-theme -BuildRequires: libgcrypt-devel +BuildRequires: libgcrypt-devel >= 1.7 BuildRequires: libqt5-linguist-devel -BuildRequires: libykpers-devel BuildRequires: libyubikey-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -43,17 +42,15 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(bash-completion) +BuildRequires: pkgconfig(libargon2) +BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libmicrohttpd) +BuildRequires: pkgconfig(libsodium) >= 1.0.12 BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(ykpers-1) BuildRequires: pkgconfig(zlib) Requires: hicolor-icon-theme -Requires(post): hicolor-icon-theme -Requires(post): shared-mime-info -Requires(post): update-desktop-files -Requires(postun): hicolor-icon-theme -Requires(postun): shared-mime-info -Requires(postun): update-desktop-files Recommends: %{name}-lang %description @@ -68,13 +65,15 @@ %build %cmake \ - -DWITH_XC_AUTOTYPE=ON \ - -DWITH_XC_YUBIKEY=ON \ - -DWITH_XC_HTTP=ON + -DWITH_XC_ALL=ON make %{?_smp_mflags} %install %cmake_install +for i in $(find %{buildroot} -type f -name \*.svgz) ; do + j="${i%z}" + gunzip < $i > $j +done %fdupes -s %{buildroot}/%{_prefix} %check @@ -82,34 +81,24 @@ export LANG=en_US.UTF-8 %ctest -%post -%mime_database_post -%desktop_database_post -%icon_theme_cache_post - -%postun -%mime_database_postun -%desktop_database_postun -%icon_theme_cache_postun - %files -%doc COPYING LICENSE* +%license COPYING LICENSE* %{_bindir}/%{name} %{_bindir}/%{name}-cli +%{_bindir}/%{name}-proxy %dir %{_datadir}/%{name} -%{_datadir}/%{name}/icons +%{_datadir}/%{name}/icons/ %{_datadir}/%{name}/wordlists/ %{_datadir}/applications/org.keepassxc.KeePassXC.desktop %dir %{_datadir}/metainfo %{_datadir}/metainfo/org.keepassxc.KeePassXC.appdata.xml -%{_datadir}/icons/hicolor +%{_datadir}/icons/hicolor/*/*/*%{name}* %{_datadir}/mime/packages/%{name}.xml %dir %{_libdir}/%{name} %{_libdir}/keepassxc/libkeepassx-autotype-xcb.so +%{_mandir}/man1/%{name}-cli.1* %files lang -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/translations %{_datadir}/%{name}/translations %changelog ++++++ keepassxc-2.2.4-src.tar.xz -> keepassxc-2.3.0-src.tar.xz ++++++ ++++ 239246 lines of diff (skipped)

1 0

commit squidGuard for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '18

02 Mar '18

Hello community, here is the log from the commit of package squidGuard for openSUSE:Factory checked in at 2018-03-02 21:10:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squidGuard (Old) and /work/SRC/openSUSE:Factory/.squidGuard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "squidGuard" Fri Mar 2 21:10:13 2018 rev:29 rq:580950 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/squidGuard/squidGuard.changes 2018-02-16 21:43:46.969012460 +0100 +++ /work/SRC/openSUSE:Factory/.squidGuard.new/squidGuard.changes 2018-03-02 21:10:13.856128098 +0100 @@ -1,0 +2,19 @@ +Wed Feb 28 12:29:06 UTC 2018 - mpluskal(a)suse.com + +- Cleanup with spec-cleaner + +------------------------------------------------------------------- +Wed Feb 28 10:12:20 UTC 2018 - adam.majer(a)suse.de + +- remove patches that modify generated code instead of template. + They are already in the template and are unnedded. + + squidGuard-trailing_dot.patch + + squidGuard-unusual_url_end.patch +- update patches removing parts that update generated code + + squidGuard-1.4_upgrade.patch + + type_fixes.patch +- remove generated code before applying patches +- use SPDX 3.0 license and install it correctly + squidGuard is GPL-2.0-only + +------------------------------------------------------------------- Old: ---- squidGuard-trailing_dot.patch squidGuard-unusual_url_end.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squidGuard.spec ++++++ --- /var/tmp/diff_new_pack.cPFnN5/_old 2018-03-02 21:10:15.236078474 +0100 +++ /var/tmp/diff_new_pack.cPFnN5/_new 2018-03-02 21:10:15.252077899 +0100 @@ -16,18 +16,18 @@ # -%define sg_dbhome /var/lib/squidGuard/db -%define sg_logdir /var/log/squidGuard -%define sg_config /etc/squidguard.conf +%define sg_dbhome %{_localstatedir}/lib/squidGuard/db +%define sg_logdir %{_localstatedir}/log/squidGuard +%define sg_config %{_sysconfdir}/squidguard.conf %define cgidir /srv/www/cgi-bin %define imgdir /srv/www/htdocs/images Name: squidGuard -Summary: Filter plugin for squid -License: GPL-2.0+ -Group: Productivity/Networking/Web/Proxy Version: 1.4 Release: 0 +Summary: Filter plugin for squid +License: GPL-2.0-only +Group: Productivity/Networking/Web/Proxy Url: http://www.squidguard.org/ Source0: %{name}-%{version}.tar.bz2 Source1: README.SUSE @@ -36,16 +36,12 @@ Patch0: squidGuard-Makefile.patch Patch1: squidGuard-1.4-mysql.patch Patch2: squidGuard-config.patch -Patch3: squidGuard-trailing_dot.patch -Patch4: squidGuard-unusual_url_end.patch Patch5: squidGuard-CVE-2009-3700.patch Patch6: squidGuard-CVE-2009-3826.patch Patch7: xss_fix_02_2015.patch Patch8: squidGuard-1.4_upgrade.patch Patch9: default_config_pathfixes.patch Patch10: type_fixes.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: http_proxy BuildRequires: bison BuildRequires: db-devel BuildRequires: flex @@ -55,18 +51,15 @@ BuildRequires: libtool BuildRequires: openldap2-devel Requires: http_proxy -%if 0%{?suse_version} >= 1010 -Recommends: logrotate lynx -%else -Requires: logrotate -Requires: lynx -%endif +Requires(pre): http_proxy +Recommends: logrotate +Recommends: lynx %description SquidGuard is a filter, redirector, and access controller plugin for squid. It lets you define multiple access rules with different restrictions for -different user groups on a squid cache. SquidGuard uses squid's -standard redirector interface. +different user groups on a squid cache. SquidGuard uses squid's standard +redirector interface. %package doc Summary: Documentation and examples for squidGuard @@ -78,11 +71,11 @@ %prep %setup -q -%patch0 -p0 +# remove autogenerated stuff +rm src/sgDiv.c contrib/sgclean/sgclean +%patch0 %patch1 -p1 -%patch2 -p0 -%patch3 -p0 -%patch4 -p0 +%patch2 %patch5 -p1 %patch6 -p1 %patch7 -p1 @@ -101,10 +94,7 @@ %build gettextize -export CFLAGS="%optflags" -./configure \ - --bindir=%{_sbindir} \ - --sbindir=%{_sbindir} \ +%configure \ --with-squiduser=squid \ --with-mysql \ --with-nolog=yes \ @@ -117,62 +107,58 @@ pushd contrib make %{?_smp_mflags} popd -# --------------------------------------------------------------------------- %install -mkdir $RPM_BUILD_ROOT/etc -%makeinstall +mkdir %{buildroot}%{_sysconfdir} +%make_install # fix install dir -if [ -f $RPM_BUILD_ROOT/%{_bindir}/squidGuard ]; then - mkdir -p $RPM_BUILD_ROOT/%{_sbindir} - install -m755 $RPM_BUILD_ROOT/%{_bindir}/squidGuard $RPM_BUILD_ROOT/%{_sbindir}/ - rm -rf $RPM_BUILD_ROOT/%{_bindir} +if [ -f %{buildroot}/%{_bindir}/squidGuard ]; then + mkdir -p %{buildroot}/%{_sbindir} + install -m755 %{buildroot}/%{_bindir}/squidGuard %{buildroot}/%{_sbindir}/ + rm -rf %{buildroot}/%{_bindir} fi # install blacklist -mkdir -p $RPM_BUILD_ROOT/var/lib/squidGuard/db/blacklist -install -m 644 test/blacklist/* $RPM_BUILD_ROOT/var/lib/squidGuard/db/blacklist +mkdir -p %{buildroot}%{_localstatedir}/lib/squidGuard/db/blacklist +install -m 644 test/blacklist/* %{buildroot}%{_localstatedir}/lib/squidGuard/db/blacklist # install cgi -mkdir -p $RPM_BUILD_ROOT/%{cgidir} -mkdir -p $RPM_BUILD_ROOT/%{imgdir} -install -m755 samples/*.cgi $RPM_BUILD_ROOT/%{cgidir}/ -install -m644 samples/babel* $RPM_BUILD_ROOT/%{cgidir}/ -install -m644 %{S:3} $RPM_BUILD_ROOT/%{imgdir}/blocked.gif +mkdir -p %{buildroot}/%{cgidir} +mkdir -p %{buildroot}/%{imgdir} +install -m755 samples/*.cgi %{buildroot}/%{cgidir}/ +install -m644 samples/babel* %{buildroot}/%{cgidir}/ +install -m644 %{SOURCE3} %{buildroot}/%{imgdir}/blocked.gif # prepare logdir -mkdir -p $RPM_BUILD_ROOT%{sg_logdir} +mkdir -p %{buildroot}%{sg_logdir} # prepare logrotate -mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d -sed "s|@SG_LOGDIR@|%{sg_logdir}|g" %{SOURCE2} > $RPM_BUILD_ROOT/etc/logrotate.d/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +sed "s|@SG_LOGDIR@|%{sg_logdir}|g" %{SOURCE2} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name} # clean up rm -f {contrib,doc,samples,test}/{Makefile,*.in,*/*.in,.*.swp} # install docu -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} -cp -r {contrib,doc,samples,test} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -cp ANNOUNCE CHANGELOG COPYING FAQ GPL ISSUES.txt README* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -# --------------------------------------------------------------------------- +mkdir -p %{buildroot}/%{_defaultdocdir}/%{name} +cp -r {contrib,doc,samples,test} %{buildroot}/%{_defaultdocdir}/%{name}/ +cp ANNOUNCE CHANGELOG FAQ ISSUES.txt README* %{buildroot}/%{_defaultdocdir}/%{name}/ %files -%defattr(-,root,root) +%license GPL COPYING %dir %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}/ANNOUNCE %doc %{_defaultdocdir}/%{name}/CHANGELOG -%doc %{_defaultdocdir}/%{name}/COPYING %doc %{_defaultdocdir}/%{name}/FAQ -%doc %{_defaultdocdir}/%{name}/GPL %doc %{_defaultdocdir}/%{name}/ISSUES.txt %doc %{_defaultdocdir}/%{name}/README* -%attr(770, squid, squid) %dir /var/lib/squidGuard +%attr(770, squid, squid) %dir %{_localstatedir}/lib/squidGuard %attr(770, squid, squid) %dir %{sg_dbhome} %attr(770, squid, squid) %dir %{sg_logdir} %config(noreplace) %attr(660, squid, squid) %{sg_config} -%config(noreplace) %attr(660, squid, squid) /var/lib/squidGuard/db/blacklist -%config(noreplace) /etc/logrotate.d/%{name} +%config(noreplace) %attr(660, squid, squid) %{_localstatedir}/lib/squidGuard/db/blacklist +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_sbindir}/* %dir %{imgdir} %{cgidir}/* %{imgdir}/* %files doc -%defattr(-,root,root) +%license GPL COPYING %doc %{_defaultdocdir}/%{name}/contrib %doc %{_defaultdocdir}/%{name}/doc %doc %{_defaultdocdir}/%{name}/samples ++++++ squidGuard-1.4_upgrade.patch ++++++ --- /var/tmp/diff_new_pack.cPFnN5/_old 2018-03-02 21:10:15.492069268 +0100 +++ /var/tmp/diff_new_pack.cPFnN5/_new 2018-03-02 21:10:15.496069124 +0100 @@ -50,18 +50,6 @@ /* sgLogError("%s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method); */ break; } -diff -urN squidGuard-1.4.orig/src/sgDiv.c squidGuard-1.4.upgraded/src/sgDiv.c ---- squidGuard-1.4.orig/src/sgDiv.c 2013-12-11 17:42:15.000000000 +1300 -+++ squidGuard-1.4.upgraded/src/sgDiv.c 2013-12-11 18:58:33.000000000 +1300 -@@ -771,7 +771,7 @@ - } - sgLogError("Going into emergency mode"); - while(fgets(buf, MAX_BUF, stdin) != NULL){ -- puts(""); -+ puts("ERR"); - fflush(stdout); - } - sgLogError("ending emergency mode, stdin empty"); diff -urN squidGuard-1.4.orig/src/sgDiv.c.in squidGuard-1.4.upgraded/src/sgDiv.c.in --- squidGuard-1.4.orig/src/sgDiv.c.in 2013-12-11 17:42:15.000000000 +1300 +++ squidGuard-1.4.upgraded/src/sgDiv.c.in 2013-12-11 18:58:40.000000000 +1300 ++++++ type_fixes.patch ++++++ --- /var/tmp/diff_new_pack.cPFnN5/_old 2018-03-02 21:10:15.564066679 +0100 +++ /var/tmp/diff_new_pack.cPFnN5/_new 2018-03-02 21:10:15.564066679 +0100 @@ -48,18 +48,6 @@ } } } -Index: squidGuard-1.4/src/sgDiv.c -=================================================================== ---- squidGuard-1.4.orig/src/sgDiv.c -+++ squidGuard-1.4/src/sgDiv.c -@@ -18,6 +18,7 @@ - - #include "sg.h" - #include "sgEx.h" -+#include "HTEscape.h" - - /* #define METEST 8; */ - Index: squidGuard-1.4/src/sg.h.in =================================================================== --- squidGuard-1.4.orig/src/sg.h.in

1 0

commit perl-Net-SSH2 for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '18

02 Mar '18

Hello community, here is the log from the commit of package perl-Net-SSH2 for openSUSE:Factory checked in at 2018-03-02 21:10:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Net-SSH2 (Old) and /work/SRC/openSUSE:Factory/.perl-Net-SSH2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Net-SSH2" Fri Mar 2 21:10:10 2018 rev:9 rq:580612 version:0.69 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Net-SSH2/perl-Net-SSH2.changes 2018-01-09 14:51:26.840713112 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Net-SSH2.new/perl-Net-SSH2.changes 2018-03-02 21:10:12.552174990 +0100 @@ -1,0 +2,9 @@ +Sun Feb 25 06:40:15 UTC 2018 - coolo(a)suse.com + +- updated to 0.69 + see /usr/share/doc/packages/perl-Net-SSH2/Changes + + 0.69 2018-2-24 + - Fix META.yml generation (bug report by Slaven Rezic). + +------------------------------------------------------------------- Old: ---- Net-SSH2-0.68.tar.gz New: ---- Net-SSH2-0.69.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Net-SSH2.spec ++++++ --- /var/tmp/diff_new_pack.cQIkZD/_old 2018-03-02 21:10:13.532139749 +0100 +++ /var/tmp/diff_new_pack.cQIkZD/_new 2018-03-02 21:10:13.536139605 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Net-SSH2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,11 @@ Name: perl-Net-SSH2 -Version: 0.68 +Version: 0.69 Release: 0 %define cpan_name Net-SSH2 Summary: Support for the SSH 2 protocol via libssh2 -License: Artistic-1.0 or GPL-1.0+ +License: Artistic-1.0 OR GPL-1.0-or-later Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Net-SSH2/ Source0: https://cpan.metacpan.org/authors/id/S/SA/SALVA/%{cpan_name}-%{version}.tar… ++++++ Net-SSH2-0.68.tar.gz -> Net-SSH2-0.69.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSH2-0.68/Changes new/Net-SSH2-0.69/Changes --- old/Net-SSH2-0.68/Changes 2017-12-13 09:22:01.000000000 +0100 +++ new/Net-SSH2-0.69/Changes 2018-02-24 21:37:53.000000000 +0100 @@ -1,5 +1,8 @@ Revision history for Perl extension Net::SSH2. +0.69 2018-2-24 + - Fix META.yml generation (bug report by Slaven Rezic). + 0.68 2017-12-13 - Fix build when using perl 5.26 which doesn't have "." in @INC anymore (patch by Marc-Philip Werner). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSH2-0.68/META.yml new/Net-SSH2-0.69/META.yml --- old/Net-SSH2-0.68/META.yml 2017-07-19 09:56:59.000000000 +0200 +++ new/Net-SSH2-0.69/META.yml 2018-02-24 21:39:47.000000000 +0100 @@ -22,7 +22,7 @@ provides: Net::SSH2: file: lib/Net/SSH2.pm - version: '0.66' + version: '0.69' Net::SSH2::Channel: file: lib/Net/SSH2/Channel.pm Net::SSH2::Dir: @@ -42,4 +42,4 @@ resources: license: http://dev.perl.org/licenses/ repository: git://github.com/rkitover/net-ssh2.git -version: '0.66' +version: '0.69' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSH2-0.68/Makefile.PL new/Net-SSH2-0.69/Makefile.PL --- old/Net-SSH2-0.68/Makefile.PL 2017-12-13 09:16:15.000000000 +0100 +++ new/Net-SSH2-0.69/Makefile.PL 2018-02-24 18:34:39.000000000 +0100 @@ -1,5 +1,9 @@ -use lib "."; -use inc::Module::Install 0.91; + +BEGIN { + unshift @INC, '.' unless -d ".git"; +} + +use inc::Module::Install 1.17; use Cwd; use Config; use File::Glob qw(bsd_glob); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSH2-0.68/README new/Net-SSH2-0.69/README --- old/Net-SSH2-0.68/README 2017-04-18 15:45:36.000000000 +0200 +++ new/Net-SSH2-0.69/README 2018-02-24 21:38:48.000000000 +0100 @@ -83,7 +83,7 @@ More examples for the example/ directory would be nice. -Add get/put (file) methods to Net::SSH2::SFTP (as a shortcut, rather than +Add get/put (file) methods to Net::SSH2::SFTP (as a shortcut, rather than requiring open/read/write/close). COPYRIGHT AND LICENCE @@ -92,7 +92,7 @@ Copyright (C) 2010-2016 by Rafael Kitover (rkitover(a)cpan.org) -Copyright (C) 2011-2017 by Salvador Fandino (salva(a)cpan.org) +Copyright (C) 2011-2018 by Salvador Fandino (salva(a)cpan.org) All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSH2-0.68/inc/Devel/CheckLib.pm new/Net-SSH2-0.69/inc/Devel/CheckLib.pm --- old/Net-SSH2-0.68/inc/Devel/CheckLib.pm 2017-07-19 09:56:59.000000000 +0200 +++ new/Net-SSH2-0.69/inc/Devel/CheckLib.pm 2018-02-24 21:39:46.000000000 +0100 @@ -6,7 +6,7 @@ use 5.00405; #postfix foreach use strict; use vars qw($VERSION @ISA @EXPORT); -$VERSION = '1.10'; +$VERSION = '1.07'; use Config qw(%Config); use Text::ParseWords 'quotewords'; @@ -355,7 +355,7 @@ push @missing, $header if $rv != 0 || ! -x $exefile; _cleanup_exe($exefile); unlink $cfile; - } + } # now do each library in turn with headers my($ch, $cfile) = File::Temp::tempfile( @@ -409,8 +409,6 @@ ); } warn "# @sys_cmd\n" if $args{debug}; - local $ENV{LD_RUN_PATH} = join(":", @libpaths).":".$ENV{LD_RUN_PATH} unless $^O eq 'MSWin32'; - local $ENV{PATH} = join(";", @libpaths).";".$ENV{PATH} if $^O eq 'MSWin32'; my $rv = $args{debug} ? system(@sys_cmd) : _quiet_system(@sys_cmd); if ($rv != 0 || ! -x $exefile) { push @missing, $lib; @@ -474,7 +472,7 @@ push @Config_ldflags, $config_val if ( $config_val =~ /\S/ ); } my @ccflags = grep { length } quotewords('\s+', 1, $Config_ccflags||'', $user_ccflags||''); - my @ldflags = grep { length && $_ !~ m/^-Wl/ } quotewords('\s+', 1, @Config_ldflags, $user_ldflags||''); + my @ldflags = grep { length } quotewords('\s+', 1, @Config_ldflags, $user_ldflags||''); my @paths = split(/$Config{path_sep}/, $ENV{PATH}); my @cc = split(/\s+/, $Config{cc}); if (check_compiler ($cc[0], $debug)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-SSH2-0.68/lib/Net/SSH2.pm new/Net-SSH2-0.69/lib/Net/SSH2.pm --- old/Net-SSH2-0.68/lib/Net/SSH2.pm 2017-12-13 09:22:24.000000000 +0100 +++ new/Net-SSH2-0.69/lib/Net/SSH2.pm 2018-02-24 21:38:07.000000000 +0100 @@ -1,6 +1,6 @@ package Net::SSH2; -our $VERSION = '0.68'; +our $VERSION = '0.69'; use 5.006; use strict; @@ -1476,7 +1476,7 @@ Copyright (C) 2010 - 2016 by Rafael Kitover (rkitover(a)cpan.org) -Copyright (C) 2011 - 2017 by Salvador FandiE<ntilde>o (salva(a)cpan.org) +Copyright (C) 2011 - 2018 by Salvador FandiE<ntilde>o (salva(a)cpan.org) All rights reserved.

1 0

commit java-1_8_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '18

02 Mar '18

Hello community, here is the log from the commit of package java-1_8_0-openjdk for openSUSE:Factory checked in at 2018-03-02 21:09:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_8_0-openjdk" Fri Mar 2 21:09:45 2018 rev:56 rq:582003 version:1.8.0.161 Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes 2018-01-29 14:56:30.861166145 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes 2018-03-02 21:09:49.385008106 +0100 @@ -1,0 +2,572 @@ +Thu Mar 1 06:55:49 UTC 2018 - fstrba(a)suse.com + +- Update to vesion jdk8u161 (icedtea 3.7.0) - bsc#1076366 + * Security fixes + + S8160104: CORBA communication improvements + + S8172525, CVE-2018-2579: Improve key keying case + + S8174756: Extra validation for public keys + + S8174962, CVE-2018-2582: Better interface invocations + + S8175932: Improve host instance supports + + S8176458: Revise default document styling + + S8178449, CVE-2018-2588: Improve LDAP logins + + S8178458: Better use of certificates in LDAP + + S8178466: Better RSA parameters + + S8179536: Cleaner print job handling + + S8179990: Cleaner palette entry handling + + S8180011: Cleaner native graphics device handling + + S8180015: Cleaner AWT robot handling + + S8180020: Improve SymbolHashMap entry handling + + S8180433: Cleaner CLR invocation handling + + S8180877: More deeply colored ICC spaces + + S8181664: Improve JVM UTF String handling + + S8181670: Improve implementation of keystores + + S8182125, CVE-2018-2599: Improve reliability of DNS lookups + + S8182387, CVE-2018-2603: Improve PKCS usage + + S8182601, CVE-2018-2602: Improve usage messages + + S8185292, CVE-2018-2618: Stricter key generation + + S8185325, CVE-2018-2641: Improve GTK initialization + + S8186080: Transform XML interfaces + + S8186212, CVE-2018-2629: Improve GSS handling + + S8186600, CVE-2018-2634: Improve property negotiations + + S8186606, CVE-2018-2633: Improve LDAP lookup robustness + + S8186699: Clean up extra Derby files + + S8186867: Improve native glyph layouts + + S8186998, CVE-2018-2637: Improve JMX supportive features + + S8189284, CVE-2018-2663: More refactoring for deserialization + cases + + S8190289, CVE-2018-2677: More refactoring for client + deserialization cases + + S8191142, CVE-2018-2678: More refactoring for naming + deserialization cases + * Import of OpenJDK 8 u152 build 16 + + S4953367: MAWT: Java should be more careful manipulating + NLSPATH, XFILESEARCHPATH env variables + + S6772009: + java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java + test failed with 'Completed != 2' + + S6947916: JarURLConnection does not handle useCaches correctly + + S6980209: Make tracking SecondaryLoop.enter/exit methods + easier + + S7052625: com/sun/net/httpserver/bugs/6725892/Test.java fails + intermittently + + S7102702: + java/net/PortUnreachableException/OneExceptionOnly.java failing + + S7131356: (props) "No Java runtime present, requesting + install" when creating VM from JNI [macosx] + + S7172652: With JDK 1.7 text field does not obtain focus when + using mnemonic Alt/Key combin + + S8022291: Mac OS: Unexpected JavaLaunchHelper message + displaying + + S8022580: sun.net.ftp.impl.FtpClient.nameList(String path) + handles "null" incorrectly + + S8025306: Inet[4|6]Address class and fieldID initialization + in networking native code + + S8028363: XmlGregorianCalendarImpl.getTimeZone() bug when + offset is less than 10 minutes + + S8028725: [Parfait] warnings from b116 for + jdk.src.solaris.native.java.net: JNI pending exceptions + + S8028769: Check src/share/native/java/lang/*.c for cases when + JNI calls are used with pending warnings + + S8029018: (bf) Check src/share/native/java/nio/Bits.c for JNI + pending exceptions + + S8030116: (process) Check Parfait warnings in + src/solaris/native/java/lang/* + + S8031586: Check jdk/src/*/native/com/sun/security/auth/module + for pending JNI exceptions + + S8033371: jdk/src/solaris/native/java/lang/ProcessEnvironment.c + environ doesn't check for JNI pending exceptions + + S8033372: Check jdk/src/share/native/java/lang for JNI + pending exception issues + + S8034102: Check solaris/native/sun/nio/fs/MacOSXNativeDispatcher.c + for JNI pending exceptions + + S8034249: need more workarounds for suspend equivalent + condition issue + + S8035158: Remove dependency on sun.misc.RegexpPool and friends + + S8035568: [macosx] Cursor management unification + + S8035653: InetAddress.getLocalHost crash + + S8037346: Need to terminate server process if client runs + into problems + + S8037909: JNI warnings in + jdk/src/windows/native/java/nio/MappedByteBuffer.c + + S8038075: JNI warnings in + jdk/src/share/native/sun/misc/VMSupport.c + + S8038348: Instance field load is replaced by wrong data Phi + + S8039412: Stack overflow on Linux using + DialogTypeSelection.NATIVE + + S8040322: TextArea.replaceRange() and insert() are broken + with setText(null) + + S8040635: [macosx] Printing a shape filled with a texture + doesn't work under Mac OS X + + S8043913: remove legacy code in SPARC's + VM_Version::platform_features + + S8046768: com/sun/jndi/ldap/LdapTimeoutTest.java fails + intermittently + + S8046893: JNI exception pending in + jdk/src/solaris/native/java/net: ExtendedOptionsImpl.c, + PlainDatagramSocketImpl.c + + S8046901: Check jdk/src/solaris/native/sun/nio for Parfait + flagged uninitialized memory + + S8049717: expose L1_data_cache_line_size for + diagnostic/sanity checks + + S8050478: [macosx] Cursor not updating correctly after + closing a modal dialog + + S8054214: JapaneseEra.getDisplayName doesn't return names if + it's an additional era + + S8055204: Memory leak in + jdk/src/windows/native/java/lang/java_props_md.c + + S8058316: lookupDefaultPrintService returns null on Solaris 11 + + S8061258: [macosx] PrinterJob's native Print Dialog does not + reflect specified Copies or Page Ranges + + S8064470: JNI exception pending in + jdk/src/java/base/unix/native/libjava/FileDescriptor_md.c + + S8066250: compiler/dependencies/MonomorphicObjectCall/ + /TestMonomorphicObjectCall.java fails product + + S8067059: PrinterJob.pageDialog() with + DialogSelectionType.NATIVE returns a PageFormat when + cancelled. + + S8071424: JCK test api/java_net/Socket/descriptions.html#Bind + crashes on Windows + + S8075516: Deleting a file from either the open or save + java.awt.FileDialog hangs. + + S8076249: NPE in AccessBridge while editing JList model + + S8076554: [macosx] Custom Swing text components need to allow + standard accessibility + + S8080486: JNI exception pending in jdk/src/java.base/windows/ + /native/libnet/DualStackPlainSocketImpl.c + + S8081219: hs_err improvement: Add event logging for class + redefinition to the hs_err file + + S8087144: sun/security/krb5/auto/MaxRetries.java fails with + Retry count is -1 less + + S8087342: Crash in + klassItable::initialize_itable_for_interface + + S8089573: [macosx] Incorrect char to glyph mapping printing + on OSX 10.10 + + S8129361: ISO 4217 amendment 160 + + S8130041: TsacertOptionTest.java intermittently fails on Mac + + S8132209: DiagnosticCommandImpl.getNotificationInfo() may + expose internal representation + + S8132455: com/sun/jndi/ldap/LdapTimeoutTest.java fails at + handleNamingException + + S8134119: Use new API to get cache line sizes + + S8134389: Crash in HotSpot with jvm.dll+0x42b48 + ciObjectFactory::create_new_metadata + + S8134918: C2: Type speculation produces mismatched unsafe + accesses + + S8135124: com/sun/jndi/ldap/LdapTimeoutTest.java failed + intermittently + + S8136570: Stop changing user environment variables related to + /usr/dt + + S8139189: VK_OEM_102 dead key detected as VK_UNDEFINED + + S8140309: [REDO] failed: no mismatched stores, except on raw + memory: StoreB StoreI + + S8140525: AwtFrame::WmShowWindow() may steal focus + + S8141370: com/sun/jndi/ldap/LdapTimeoutTest.java failed + intermittently + + S8143897: Weblogic12medrec assert(handler_address == + SharedRuntime::compute_compiled_exc_handler(nm, pc, exception, + force_unwind, true)) failed: Must be the same + + S8145207: [macosx] JList, VO can't access non-visible list + items + + S8145732: Duplicate entry in http.nonProxyHosts will ignore + subsequent entries + + S8145952: ISO 4217 amendment 161 + + S8145981: (fs) LinuxWatchService can reports events against + wrong directory + + S8146961: Fix PermGen memory leaks caused by static final + Exceptions + + S8147772: Update KerberosTicket to describe behavior if it + has been destroyed and fix NullPointerExceptions + + S8149521: automatic discovery of LDAP servers with Kerberos + authentication + + S8149714: [parfait] char array lengths don't match in + awt_Font.cpp:1701 + + S8152000: Java FlightRecorder does not run on Java 8 compact + 3 profile since u65 + + S8152172: PPC64: Support AES intrinsics + + S8152730: File Leak in CompileBroker::init_compiler_thread_log + of compileBroker.cpp:1665. + + S8152981: Double icons with JMenuItem + setHorizontalTextPosition on Win 10 + + S8153134: Infinite loop in handle_wrong_method in jmod + + S8153176: ParOldGC: Use correct TaskQueueSet for + ParallelTaskTerminator in marking. + + S8153267: nmethod's exception cache not multi-thread safe + + S8153925: (fs) WatchService hangs on GetOverlappedResult and + locks directory (win) + + S8154945: Enable 8130150 and 8081778 intrinsics by default + + S8155691: Update GIFlib library to the latest up-to-date ++++ 375 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes ++++ and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes Old: ---- icedtea-3.6.0.tar.xz tzdb_dat.patch New: ---- aarch64.patch icedtea-3.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_8_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.0WxdUX/_old 2018-03-02 21:09:53.764850601 +0100 +++ /var/tmp/diff_new_pack.0WxdUX/_new 2018-03-02 21:09:53.768850458 +0100 @@ -18,7 +18,7 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm} -%global icedtea_version 3.6.0 +%global icedtea_version 3.7.0 %global icedtea_sound_version 1.0.1 %global buildoutputdir openjdk.build/ # Convert an absolute path to a relative path. Each symbolic link is @@ -32,7 +32,7 @@ # priority must be 6 digits in total %global priority 1805 %global javaver 1.8.0 -%global updatever 151 +%global updatever 161 %global buildver 12 # Standard JPackage directories and symbolic links. %global sdklnk java-%{javaver}-openjdk @@ -167,7 +167,7 @@ Version: %{javaver}.%{updatever} Release: 0 Summary: OpenJDK 8 Runtime Environment -License: Apache-1.1 AND Apache-2.0 AND GPL-1.0+ AND GPL-2.0 AND GPL-2.0-with-classpath-exception AND LGPL-2.0 AND MPL-1.0 AND MPL-1.1 AND SUSE-Public-Domain AND W3C +License: Apache-1.1 AND Apache-2.0 AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-with-classpath-exception AND LGPL-2.0-only AND MPL-1.0 AND MPL-1.1 AND SUSE-Public-Domain AND W3C Group: Development/Languages/Java Url: http://openjdk.java.net/ Source0: http://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar… @@ -204,7 +204,7 @@ Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch Patch2000: java-1_8_0-openjdk-gcc6.patch Patch2001: disable-doclint-by-default.patch -Patch2002: tzdb_dat.patch +Patch2002: aarch64.patch BuildRequires: alsa-lib-devel BuildRequires: autoconf BuildRequires: automake ++++++ aarch32.tar.xz ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/aarch32.tar.xz /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/aarch32.tar.xz differ: char 26, line 1 ++++++ aarch64.patch ++++++ --- openjdk/jdk/make/lib/CoreLibraries.gmk 2018-03-02 11:40:00.837643131 +0100 +++ openjdk/jdk/make/lib/CoreLibraries.gmk 2018-03-02 13:45:46.388284169 +0100 @@ -69,7 +69,6 @@ CFLAGS_aix := -qfloat=nomaf, \ CFLAGS_linux_ppc64 := $(FP_CONTRACT_CFLAGS), \ CFLAGS_linux_ppc64le := $(FP_CONTRACT_CFLAGS), \ - CFLAGS_linux_aarch64 := $(FP_CONTRACT_CFLAGS), \ ARFLAGS := $(ARFLAGS), \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) ++++++ corba.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-13a5a8a3c66f/.hgtags new/corba-872ca6c060bb/.hgtags --- old/corba-13a5a8a3c66f/.hgtags 2017-10-30 18:28:36.000000000 +0100 +++ new/corba-872ca6c060bb/.hgtags 2018-02-06 19:20:51.000000000 +0100 @@ -726,6 +726,8 @@ 8ef3cc2bbc7dc687e9502ae957337b1ded1b32d4 jdk8u112-b16 fbc3183924c82a612dc92cda261f19e227df2b32 icedtea-3.3.0pre01 7d4291146927c3430652a07f506d530c2eff7eb9 jdk8u112-b31 +46db19bfd51b4039cff4dae563c3b5d3f70d64da jdk8u112-b32 +d52e17760c1dafa4fa17ec388aeaaf8fcacb444b jdk8u112-b33 3a25f8a752524bad7e78800158c485b890be3982 jdk8u121-b00 1ebd97292358cd158b6f7d5884526207fbfe796e jdk8u121-b01 349d130d7a7f2bcaaed8dd2696030022eb4e7b75 jdk8u121-b02 @@ -743,6 +745,12 @@ 8eb9dd5fe2fb9752a91f44647143348a6b1231fd icedtea-3.3.0 d812240fb5767253e4c64e5afd925d6f9ec60b0c icedtea-3.4.0pre01 386e9b79fcf5bfad5ff7b0fc991a7c6c5cbfed17 jdk8u121-b13 +61eb6e79aabe13253306d6e614a21619dacfa2cc jdk8u121-b31 +d28f2fc91487a86a7deffe71e38179067807c60b jdk8u121-b32 +58f874750c2823443a8712f3728e6aa91d45bb5b jdk8u121-b33 +3f0f5fc9e9a8c487dee66d7b300e265a10fd1355 jdk8u121-b34 +345b15579d5e3563e818d95ff9c47cabea1c5771 jdk8u121-b35 +1c16b68906a0bf305f1e23072bfd6cb3f3fc84be jdk8u121-b36 e30c16839f2225d2fff653088636dafcb812cd4d jdk8u131-b00 464cf9d3b00291fcf879ceca1b66bc7588093c47 jdk8u131-b01 1656050026687c96900eed3b415d0ca1a0dc55b3 jdk8u131-b02 @@ -757,6 +765,10 @@ 22ed32f45405a21f1d388d183cd34fd28a335f7b icedtea-3.4.0 324f4699760f52a2ef893d3c31affd62074748f9 icedtea-3.5.0pre01 2b88cb53e31fb637d7c37cc3414bb3eb3e9d1f0d jdk8u131-b11 +4db7f76e9f3266c8ba5c801996b27009bb17b335 jdk8u131-b31 +d81babb8888496371bb80757f2650dec9ff95175 jdk8u131-b32 +6184f10981e7a321b52c13c609bb41f289d85270 jdk8u131-b33 +2cb574e6eca33fad6858dcfc9c6c7b45a112e965 jdk8u131-b34 7056e474d6e3b7b3bac76bc35f8c4c321bf9abe9 jdk8u141-b00 0f825574a7c8742494810d1f29193bfc3f1d370c jdk8u141-b01 66d2dbe82668e425317ec0c421f5384399b220c9 jdk8u141-b02 @@ -780,6 +792,14 @@ b5485d6bc171bcff18deeda166e5b6c297597e24 icedtea-3.6.0pre01 0c8bc00d9e308f4ebf7f1a888419904a6121a657 icedtea-3.6.0pre02 0d5d2e29f93b01ffa4998c2e3a61d2e6eaa96b1b jdk8u144-b01 +e03501807899791ff7888884bcf47eb39be594bb jdk8u141-b31 +1bbe5d997ab4e030dd961ab78e11ddae1bc6786c jdk8u141-b32 +77461a27d91fcb53106e6b3234468bff4d0eec9e jdk8u144-b00 +0d5d2e29f93b01ffa4998c2e3a61d2e6eaa96b1b jdk8u144-b01 +d3a4dd903475fd77fae2f6f87deb9219f455dcff jdk8u144-b31 +5d81bcd53ba0d79ab2843891759b31e4ef497fad jdk8u144-b32 +b7f3faccefc33fc76d7c5c1c4d4cf6c85d0dad61 jdk8u144-b33 +ecfa8b7c2c1f71a3f9240ad0c6a5e3f7104a9cce jdk8u144-b34 2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00 4449c73dbfdf2e32889e3ce769bd4160daa48b71 jdk8u151-b01 ffa099d5b88ff14cea677d2afa4229354e9404d0 jdk8u151-b02 @@ -792,3 +812,73 @@ c5f095a1df38d9be119adcab5bbd7e4365e21871 jdk8u151-b09 05a4bb70c2d84442e505b40e2059399da3f65633 jdk8u151-b10 ea10de07bc171c8cf89f2acbc4a1288d4dc0f2d6 jdk8u151-b11 +13a5a8a3c66f74af86a1f06c533eb5ca64a65e6f icedtea-3.6.0 +87aaf4f5274e047cd1e0822a6b57dafcb987544b jdk8u151-b12 +58d0ffe75dc5597310d422e214dc077476bd2338 jdk8u122-b00 +a87b06da783bb5a11f7857220789979129e39e7c jdk8u122-b01 +8684348ae5eb6f895d19e4752dea567642dbcec4 jdk8u122-b02 +117a593d021502529821afbd7e0d695c170449f8 jdk8u122-b03 +117a593d021502529821afbd7e0d695c170449f8 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +f8661a76fe475b1d7653493e407086830fde81f8 jdk8u122-b03 +7bd4195b17aa0a268eee4bc4b89f30ed3b096898 jdk8u122-b04 +f86d6064d7cfa022425c3df03d4335511ab33ecb jdk8u132-b00 +ea3d3c26102dcb82d9b140f729308395310dae7a jdk8u152-b00 +1819d008129b31df8c74b5d16e9daabc2bdcc10c jdk8u152-b01 +06f411ed0014d88050d9bd1e74c208a9fa3cfb6e jdk8u152-b02 +d36e9c6f195c5604626f7c836c17826960ca2a11 jdk8u152-b03 +4f94cc55256028ab54390abe212959c241b0670f jdk8u152-b04 +2917e61cfadab474625d19fb7775ccdec5584738 jdk8u152-b05 +bc6e4d3f7a20c34dcdccc1be17792188ccdcb917 jdk8u152-b06 +87992ac3484c6c2ae5cad4ad14701a03a9ec963c jdk8u152-b07 +1f7bbfb8b2632ac610c3a0d7d944ff0a3967469a jdk8u152-b08 +a9e83644bd11b5da49bb4424eed9c5a34003085c jdk8u152-b09 +3c302cc47b26715fb9ae863a477d6d0366feb713 jdk8u152-b10 +56a5346ca6448c188eb09de3856cbadf1532ffc4 jdk8u152-b11 +122a325c8bea6d8f49126ddc1644803d213197ae jdk8u152-b12 +f33390314a7d9311dc9474106ad6e66d71751e6d jdk8u152-b13 +2b4802994bf5a4a634258c9ff06d3da474130f8b jdk8u152-b14 +f89071fbde60b327d6940a34fcdeed96b6440dd2 jdk8u152-b15 +d3821aae5f3caf60d50d60f211a09a6a823419c9 icedtea-3.7.0pre01 +674aecf3d87ae774e2026a1cb2a60eaa651bc7c2 jdk8u152-b16 +2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00 +4449c73dbfdf2e32889e3ce769bd4160daa48b71 jdk8u151-b01 +ffa099d5b88ff14cea677d2afa4229354e9404d0 jdk8u151-b02 +a6814326f989837019ff7dd0d9b0e57065499bc5 jdk8u151-b03 +cefb3694f8565e1f23ff3231fd21523f52161a95 jdk8u151-b04 +8977426affc02fdf74b1163865059ec86ddccb61 jdk8u151-b05 +3289ad7e88f3aa38fdaa4910e9eeed5e1e5430b1 jdk8u151-b06 +58d0ffe75dc5597310d422e214dc077476bd2338 jdk8u122-b00 +a87b06da783bb5a11f7857220789979129e39e7c jdk8u122-b01 +8684348ae5eb6f895d19e4752dea567642dbcec4 jdk8u122-b02 +117a593d021502529821afbd7e0d695c170449f8 jdk8u122-b03 +117a593d021502529821afbd7e0d695c170449f8 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +f8661a76fe475b1d7653493e407086830fde81f8 jdk8u122-b03 +7bd4195b17aa0a268eee4bc4b89f30ed3b096898 jdk8u122-b04 +f86d6064d7cfa022425c3df03d4335511ab33ecb jdk8u132-b00 +ea3d3c26102dcb82d9b140f729308395310dae7a jdk8u152-b00 +1819d008129b31df8c74b5d16e9daabc2bdcc10c jdk8u152-b01 +06f411ed0014d88050d9bd1e74c208a9fa3cfb6e jdk8u152-b02 +d36e9c6f195c5604626f7c836c17826960ca2a11 jdk8u152-b03 +4f94cc55256028ab54390abe212959c241b0670f jdk8u152-b04 +2917e61cfadab474625d19fb7775ccdec5584738 jdk8u152-b05 +bc6e4d3f7a20c34dcdccc1be17792188ccdcb917 jdk8u152-b06 +87992ac3484c6c2ae5cad4ad14701a03a9ec963c jdk8u152-b07 +1f7bbfb8b2632ac610c3a0d7d944ff0a3967469a jdk8u152-b08 +a9e83644bd11b5da49bb4424eed9c5a34003085c jdk8u152-b09 +2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00 +aed470d361fe9b3a6714e6c9942923c188dcc050 jdk8u161-b00 +968a7e1a6e6c5e79237b796e562f149214e2ae9b jdk8u161-b01 +bb767c7211eace9df83649ba937d2ce507223e4d jdk8u161-b02 +b50b596df2a1b4ad86e73d0d309c27c7ba1ad0c0 jdk8u161-b03 +ea5791706d0992acb1f74129128ba5f60dcfff6e jdk8u161-b04 +897b749544e9803038c9696e145959bdc9eb5008 jdk8u161-b05 +bbdd5e2c46e87bafe419a82309ddbb1ffc8f6215 jdk8u161-b06 +b1a36f62733a920e04d9eed825264dbe12d91ef4 jdk8u161-b07 +49b9defc1bfc0507f87e05bba4de4d8b3cca1996 jdk8u161-b08 +2b03640b61bda0a4d8e89c57d919bf1742aeeb8f jdk8u161-b09 +1a3e06fc462b39d065e9fc78191cc6d8a9c33fc0 jdk8u161-b10 +104006ed6c31ed1fe46cbee9d665e0dbc6bcac13 jdk8u161-b11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-13a5a8a3c66f/ASSEMBLY_EXCEPTION new/corba-872ca6c060bb/ASSEMBLY_EXCEPTION --- old/corba-13a5a8a3c66f/ASSEMBLY_EXCEPTION 2017-10-30 18:28:36.000000000 +0100 +++ new/corba-872ca6c060bb/ASSEMBLY_EXCEPTION 2018-02-06 19:20:51.000000000 +0100 @@ -1,27 +1,27 @@ OPENJDK ASSEMBLY EXCEPTION -The OpenJDK source code made available by Sun at openjdk.java.net and -openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the -GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 +The OpenJDK source code made available by Oracle America, Inc. (Oracle) at +openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU +General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 only ("GPL2"), with the following clarification and special exception. Linking this OpenJDK Code statically or dynamically with other code is making a combined work based on this library. Thus, the terms and conditions of GPL2 cover the whole combination. - As a special exception, Sun gives you permission to link this - OpenJDK Code with certain code licensed by Sun as indicated at + As a special exception, Oracle gives you permission to link this + OpenJDK Code with certain code licensed by Oracle as indicated at http://openjdk.java.net/legal/exception-modules-2007-05-08.html ("Designated Exception Modules") to produce an executable, regardless of the license terms of the Designated Exception Modules, and to copy and distribute the resulting executable under GPL2, provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Sun. + governed by the licenses under which they were offered by Oracle. -As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to -build an executable that includes those portions of necessary code that Sun -could not provide under GPL2 (or that Sun has provided under GPL2 with the -Classpath exception). If you modify or add to the OpenJDK code, that new -GPL2 code may still be combined with Designated Exception Modules if the -new code is made subject to this exception by its copyright holder. +As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code +to build an executable that includes those portions of necessary code that +Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 +with the Classpath exception). If you modify or add to the OpenJDK code, +that new GPL2 code may still be combined with Designated Exception Modules +if the new code is made subject to this exception by its copyright holder. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-13a5a8a3c66f/THIRD_PARTY_README new/corba-872ca6c060bb/THIRD_PARTY_README --- old/corba-13a5a8a3c66f/THIRD_PARTY_README 2017-10-30 18:28:36.000000000 +0100 +++ new/corba-872ca6c060bb/THIRD_PARTY_README 2018-02-06 19:20:51.000000000 +0100 @@ -7,7 +7,7 @@ --- begin of LICENSE --- -Copyright (c) 2000-2011 France Télécom +Copyright (c) 2000-2011 France T??l??com All rights reserved. Redistribution and use in source and binary forms, with or without @@ -849,7 +849,7 @@ --- begin of LICENSE --- Copyright notice -Copyright © 2011 Ecma International +Copyright ?? 2011 Ecma International Ecma International Rue du Rhone 114 CH-1204 Geneva @@ -916,7 +916,7 @@ --- begin of LICENSE --- -Copyright © 2001,2003 Keith Packard +Copyright ?? 2001,2003 Keith Packard Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the @@ -2212,16 +2212,16 @@ Unicode Terms of Use For the general privacy policy governing access to this site, see the Unicode -Privacy Policy. For trademark usage, see the Unicode® Consortium Name and +Privacy Policy. For trademark usage, see the Unicode?? Consortium Name and Trademark Usage Policy. A. Unicode Copyright. - 1. Copyright © 1991-2013 Unicode, Inc. All rights reserved. + 1. Copyright ?? 1991-2013 Unicode, Inc. All rights reserved. 2. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative - works conforming to the Unicode® Standard, subject to Terms and + works conforming to the Unicode?? Standard, subject to Terms and Conditions herein. 3. Any person is hereby authorized, without fee, to view, use, reproduce, @@ -2287,14 +2287,14 @@ E.Trademarks & Logos. 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, - Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of + Inc. ???The Unicode Consortium??? and ???Unicode, Inc.??? are trade names of Unicode, Inc. Use of the information and materials found on this - website indicates your acknowledgement of Unicode, Inc.’s exclusive + website indicates your acknowledgement of Unicode, Inc.???s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names. - 2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark - Policy”) are incorporated herein by reference and you agree to abide by + 2. The Unicode Consortium Name and Trademark Usage Policy (???Trademark + Policy???) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. @@ -2317,12 +2317,12 @@ 2. Modification by Unicode. Unicode shall have the right to modify this Agreement at any time by posting it to this site. The user may not - assign any part of this Agreement without Unicode’s prior written + assign any part of this Agreement without Unicode???s prior written consent. 3. Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on - Unicode’s net income. + Unicode???s net income. 4. Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain @@ -2351,7 +2351,7 @@ COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the +Copyright ?? 1991-2012 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining a copy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java --- old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java 2017-10-30 18:28:36.000000000 +0100 +++ new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java 2018-02-06 19:20:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,11 +26,13 @@ package com.sun.corba.se.impl.encoding; import com.sun.corba.se.impl.orbutil.ORBConstants; +import com.sun.corba.se.impl.orbutil.ORBUtility; import com.sun.corba.se.impl.encoding.ByteBufferWithInfo; import com.sun.corba.se.impl.encoding.BufferManagerWrite; import com.sun.corba.se.pept.encoding.OutputObject; import com.sun.corba.se.pept.transport.Connection; import com.sun.corba.se.spi.orb.ORB; +import com.sun.corba.se.spi.orb.ORBData; public class BufferManagerWriteGrow extends BufferManagerWrite { @@ -48,7 +50,20 @@ * buffer manager as set in the ORB. */ public int getBufferSize() { - return orb.getORBData().getGIOPBufferSize(); + ORBData orbData = null; + int bufferSize = ORBConstants.GIOP_DEFAULT_BUFFER_SIZE; + if (orb != null) { + orbData = orb.getORBData(); + if (orbData != null) { + bufferSize = orbData.getGIOPBufferSize(); + dprint("BufferManagerWriteGrow.getBufferSize: bufferSize == " + bufferSize); + } else { + dprint("BufferManagerWriteGrow.getBufferSize: orbData reference is NULL"); + } + } else { + dprint("BufferManagerWriteGrow.getBufferSize: orb reference is NULL"); + } + return bufferSize; } public void overflow (ByteBufferWithInfo bbwi) @@ -89,4 +104,9 @@ */ public void close() {} + private void dprint(String msg) { + if (orb.transportDebugFlag) { + ORBUtility.dprint(this, msg); + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java --- old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java 2017-10-30 18:28:36.000000000 +0100 +++ new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java 2018-02-06 19:20:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,18 +32,9 @@ package com.sun.corba.se.impl.encoding; -import java.io.IOException; import java.io.Serializable; -import java.io.ByteArrayInputStream; -import java.io.ObjectInputStream; -import java.io.IOException; -import java.io.StreamCorruptedException; -import java.io.OptionalDataException; import java.io.IOException; -import java.util.Stack; - -import java.net.URL; import java.net.MalformedURLException; import java.nio.ByteBuffer; @@ -53,19 +44,11 @@ import java.math.BigDecimal; -import java.rmi.Remote; -import java.rmi.StubNotFoundException; - import java.security.AccessController; import java.security.PrivilegedExceptionAction; import java.security.PrivilegedActionException; import org.omg.CORBA.SystemException; -import org.omg.CORBA.Object; -import org.omg.CORBA.Principal; -import org.omg.CORBA.TypeCode; -import org.omg.CORBA.Any; -import org.omg.CORBA.portable.Delegate; import org.omg.CORBA.portable.ValueBase; import org.omg.CORBA.portable.IndirectionException; import org.omg.CORBA.CompletionStatus; @@ -82,15 +65,12 @@ import org.omg.CORBA.MARSHAL; import org.omg.CORBA.portable.IDLEntity; -import javax.rmi.PortableRemoteObject; import javax.rmi.CORBA.Tie; -import javax.rmi.CORBA.Util; import javax.rmi.CORBA.ValueHandler; import com.sun.corba.se.pept.protocol.MessageMediator; import com.sun.corba.se.pept.transport.ByteBufferPool; -import com.sun.corba.se.spi.protocol.RequestDispatcherRegistry; import com.sun.corba.se.spi.protocol.CorbaClientDelegate; import com.sun.corba.se.spi.ior.IOR; @@ -99,9 +79,6 @@ import com.sun.corba.se.spi.orb.ORB; import com.sun.corba.se.spi.orb.ORBVersionFactory; -import com.sun.corba.se.spi.orb.ORBVersion; - -import com.sun.corba.se.spi.protocol.CorbaMessageMediator; import com.sun.corba.se.spi.logging.CORBALogDomains; import com.sun.corba.se.spi.presentation.rmi.PresentationManager; @@ -725,12 +702,14 @@ // IDLEntity.class.isAssignableFrom( clz ). // 3. If clz is an interface, use it to create the appropriate // stub factory. + public org.omg.CORBA.Object read_Object(Class clz) { // In any case, we must first read the IOR. IOR ior = IORFactories.makeIOR(parent) ; - if (ior.isNil()) + if (ior.isNil()) { return null ; + } PresentationManager.StubFactoryFactory sff = ORB.getStubFactoryFactory() ; String codeBase = ior.getProfile().getCodebase() ; @@ -739,6 +718,7 @@ if (clz == null) { RepositoryId rid = RepositoryId.cache.getId( ior.getTypeId() ) ; String className = rid.getClassName() ; + orb.validateIORClass(className); boolean isIDLInterface = rid.isIDLType() ; if (className == null || className.equals( "" )) @@ -761,11 +741,9 @@ } else { // clz is an interface class boolean isIDL = IDLEntity.class.isAssignableFrom( clz ) ; - stubFactory = sff.createStubFactory( clz.getName(), isIDL, codeBase, clz, clz.getClassLoader() ) ; } - return internalIORToObject( ior, stubFactory, orb ) ; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java --- old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java 1970-01-01 01:00:00.000000000 +0100 +++ new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/impl/ior/IORTypeCheckRegistryImpl.java 2018-02-06 19:20:51.000000000 +0100 @@ -0,0 +1,180 @@ +/* + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.corba.se.impl.ior; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import com.sun.corba.se.impl.orbutil.ORBUtility; +import com.sun.corba.se.spi.ior.IORTypeCheckRegistry; +import com.sun.corba.se.spi.orb.ORB; + +public class IORTypeCheckRegistryImpl implements IORTypeCheckRegistry { + + private final Set<String> iorTypeNames; + private static final Set<String> builtinIorTypeNames; + private ORB theOrb; + + static { + builtinIorTypeNames = initBuiltinIorTypeNames(); + } + + public IORTypeCheckRegistryImpl(String filterProperties, ORB orb) { + theOrb = orb; + iorTypeNames = parseIorClassNameList(filterProperties); + } + + /* + * + * A note on the validation flow: + * 1. against the filter class name list + * 2. against the builtin class name list + */ + @Override + public boolean isValidIORType(String iorClassName) { + dprintTransport(".isValidIORType : iorClassName == " + iorClassName); + return validateIorTypeByName(iorClassName); + } + + + private boolean validateIorTypeByName(String iorClassName) { + dprintTransport(".validateIorTypeByName : iorClassName == " + iorClassName); + boolean isValidType; + + isValidType = checkIorTypeNames(iorClassName); + + if (!isValidType) { + isValidType = checkBuiltinClassNames(iorClassName); + } + + dprintTransport(".validateIorTypeByName : isValidType == " + isValidType); + return isValidType; + } + + + /* + * check if the class name corresponding to an IOR Type name + * is in the ior class name list as generated from the filter property. + * So if the IOR type is recorded in the registry then allow the creation of the + * stub factory and let it resolve and load the class. That is if current + * type check deliberation permits. + * IOR Type names are configured by the filter property + */ + private boolean checkIorTypeNames( + String theIorClassName) { + return (iorTypeNames != null) && (iorTypeNames.contains(theIorClassName)); + } + + /* + * Check the IOR interface class name against the set of + * class names that correspond to the builtin JDK IDL stub classes. + */ + private boolean checkBuiltinClassNames( + String theIorClassName) { + return builtinIorTypeNames.contains(theIorClassName); + } + + private Set<String> parseIorClassNameList(String filterProperty) { + Set<String> _iorTypeNames = null; + if (filterProperty != null) { + String[] tempIorClassNames = filterProperty.split(";"); + _iorTypeNames = Collections.unmodifiableSet(new HashSet<>(Arrays + .asList(tempIorClassNames))); + if (theOrb.orbInitDebugFlag) { + dprintConfiguredIorTypeNames(); + } + } + return _iorTypeNames; + } + + private static Set<String> initBuiltinIorTypeNames() { + Set<Class<?>> builtInCorbaStubTypes = initBuiltInCorbaStubTypes(); + String[] tempBuiltinIorTypeNames = new String[builtInCorbaStubTypes.size()]; + int i = 0; + for (Class<?> _stubClass : builtInCorbaStubTypes) { + tempBuiltinIorTypeNames[i++] = _stubClass.getName(); + } + return Collections.unmodifiableSet(new HashSet<>(Arrays + .asList(tempBuiltinIorTypeNames))); + } + + private static Set<Class<?>> initBuiltInCorbaStubTypes() { + Class<?> tempBuiltinCorbaStubTypes[] = { + com.sun.corba.se.spi.activation.Activator.class, + com.sun.corba.se.spi.activation._ActivatorStub.class, + com.sun.corba.se.spi.activation._InitialNameServiceStub.class, + com.sun.corba.se.spi.activation._LocatorStub.class, + com.sun.corba.se.spi.activation._RepositoryStub.class, + com.sun.corba.se.spi.activation._ServerManagerStub.class, + com.sun.corba.se.spi.activation._ServerStub.class, + org.omg.CosNaming.BindingIterator.class, + org.omg.CosNaming._BindingIteratorStub.class, + org.omg.CosNaming.NamingContextExt.class, + org.omg.CosNaming._NamingContextExtStub.class, + org.omg.CosNaming.NamingContext.class, + org.omg.CosNaming._NamingContextStub.class, + org.omg.DynamicAny.DynAnyFactory.class, + org.omg.DynamicAny._DynAnyFactoryStub.class, + org.omg.DynamicAny.DynAny.class, + org.omg.DynamicAny._DynAnyStub.class, + org.omg.DynamicAny.DynArray.class, + org.omg.DynamicAny._DynArrayStub.class, + org.omg.DynamicAny.DynEnum.class, + org.omg.DynamicAny._DynEnumStub.class, + org.omg.DynamicAny.DynFixed.class, + org.omg.DynamicAny._DynFixedStub.class, + org.omg.DynamicAny.DynSequence.class, + org.omg.DynamicAny._DynSequenceStub.class, + org.omg.DynamicAny.DynStruct.class, + org.omg.DynamicAny._DynStructStub.class, + org.omg.DynamicAny.DynUnion.class, + org.omg.DynamicAny._DynUnionStub.class, + org.omg.DynamicAny._DynValueStub.class, + org.omg.DynamicAny.DynValue.class, + org.omg.PortableServer.ServantActivator.class, + org.omg.PortableServer._ServantActivatorStub.class, + org.omg.PortableServer.ServantLocator.class, + org.omg.PortableServer._ServantLocatorStub.class}; + return new HashSet<>( + Arrays.asList(tempBuiltinCorbaStubTypes)); + } + + private void dprintConfiguredIorTypeNames() { + if (iorTypeNames != null) { + for (String iorTypeName : iorTypeNames) { + ORBUtility.dprint(this, ".dprintConfiguredIorTypeNames: " + iorTypeName); + } + } + } + + private void dprintTransport(String msg) { + if (theOrb.transportDebugFlag) { + ORBUtility.dprint(this, msg); + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java --- old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2017-10-30 18:28:36.000000000 +0100 +++ new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2018-02-06 19:20:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,37 +32,25 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.lang.reflect.InvocationTargetException; import java.util.Set; import java.util.HashSet; -import java.util.ArrayList; -import java.util.Iterator; import java.util.Properties; import java.util.Vector; import java.util.Hashtable; import java.util.Map; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Collection; import java.util.Collections; -import java.util.StringTokenizer; import java.util.Enumeration; import java.util.WeakHashMap; import java.net.InetAddress; import java.security.PrivilegedAction; +import java.security.Security; import java.security.AccessController; -import javax.rmi.CORBA.Util; import javax.rmi.CORBA.ValueHandler; -import org.omg.CORBA.Context; -import org.omg.CORBA.ContextList; -import org.omg.CORBA.Environment; -import org.omg.CORBA.ExceptionList; -import org.omg.CORBA.ORBPackage.InvalidName; import org.omg.CORBA.NVList; import org.omg.CORBA.TCKind; import org.omg.CORBA.NamedValue; @@ -75,7 +63,6 @@ import org.omg.CORBA.UnionMember; import org.omg.CORBA.ValueMember; import org.omg.CORBA.BAD_PARAM; -import org.omg.CORBA.MARSHAL; import org.omg.CORBA.portable.ValueFactory; @@ -83,10 +70,7 @@ import com.sun.org.omg.SendingContext.CodeBase; -import com.sun.corba.se.pept.broker.Broker; import com.sun.corba.se.pept.protocol.ClientInvocationInfo; -import com.sun.corba.se.pept.transport.ContactInfo; -import com.sun.corba.se.pept.transport.ConnectionCache; import com.sun.corba.se.pept.transport.TransportManager; import com.sun.corba.se.spi.ior.IOR; @@ -95,8 +79,6 @@ import com.sun.corba.se.spi.ior.IORFactories; import com.sun.corba.se.spi.ior.ObjectKey; import com.sun.corba.se.spi.ior.ObjectKeyFactory; -import com.sun.corba.se.spi.ior.iiop.IIOPFactories; -import com.sun.corba.se.spi.ior.iiop.GIOPVersion; import com.sun.corba.se.spi.oa.OAInvocationInfo; import com.sun.corba.se.spi.oa.ObjectAdapterFactory; import com.sun.corba.se.spi.orb.DataCollector; @@ -113,24 +95,18 @@ import com.sun.corba.se.spi.protocol.ClientDelegateFactory; import com.sun.corba.se.spi.protocol.RequestDispatcherRegistry; import com.sun.corba.se.spi.protocol.CorbaServerRequestDispatcher; -import com.sun.corba.se.spi.protocol.RequestDispatcherDefault; import com.sun.corba.se.spi.protocol.PIHandler; -import com.sun.corba.se.spi.protocol.CorbaMessageMediator; -import com.sun.corba.se.spi.protocol.ForwardException; import com.sun.corba.se.spi.resolver.Resolver; import com.sun.corba.se.spi.resolver.LocalResolver; -import com.sun.corba.se.spi.orb.StringPair; -import com.sun.corba.se.spi.orb.StringPair; import com.sun.corba.se.spi.transport.CorbaContactInfoListFactory; import com.sun.corba.se.spi.transport.CorbaTransportManager; +import com.sun.corba.se.spi.ior.IORTypeCheckRegistry; import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketManager; +import com.sun.corba.se.spi.logging.CORBALogDomains; import com.sun.corba.se.spi.copyobject.CopierManager; -import com.sun.corba.se.spi.presentation.rmi.PresentationDefaults; -import com.sun.corba.se.spi.presentation.rmi.PresentationManager; import com.sun.corba.se.spi.presentation.rmi.StubAdapter; import com.sun.corba.se.spi.servicecontext.ServiceContextRegistry; -import com.sun.corba.se.impl.corba.TypeCodeFactory; import com.sun.corba.se.impl.corba.TypeCodeImpl; import com.sun.corba.se.impl.corba.NVListImpl; import com.sun.corba.se.impl.corba.ExceptionListImpl; @@ -139,9 +115,6 @@ import com.sun.corba.se.impl.corba.EnvironmentImpl; import com.sun.corba.se.impl.corba.AsynchInvoke; import com.sun.corba.se.impl.corba.AnyImpl; -import com.sun.corba.se.impl.corba.RequestImpl; -import com.sun.corba.se.impl.dynamicany.DynAnyFactoryImpl; -import com.sun.corba.se.impl.encoding.EncapsOutputStream; import com.sun.corba.se.impl.encoding.CachedCodeBase; import com.sun.corba.se.impl.interceptors.PIHandlerImpl; import com.sun.corba.se.impl.interceptors.PINoOpHandlerImpl; @@ -150,12 +123,10 @@ import com.sun.corba.se.impl.ior.TaggedProfileTemplateFactoryFinderImpl; import com.sun.corba.se.impl.oa.toa.TOAFactory; import com.sun.corba.se.impl.oa.poa.BadServerIdHandler; -import com.sun.corba.se.impl.oa.poa.DelegateImpl; import com.sun.corba.se.impl.oa.poa.POAFactory; import com.sun.corba.se.impl.orbutil.ORBConstants; import com.sun.corba.se.impl.orbutil.ORBUtility; import com.sun.corba.se.impl.orbutil.StackImpl; -import com.sun.corba.se.impl.orbutil.threadpool.ThreadPoolImpl; import com.sun.corba.se.impl.orbutil.threadpool.ThreadPoolManagerImpl; import com.sun.corba.se.impl.protocol.RequestDispatcherRegistryImpl; import com.sun.corba.se.impl.protocol.CorbaInvocationInfo; @@ -164,7 +135,7 @@ import com.sun.corba.se.impl.util.Utility; import com.sun.corba.se.impl.logging.ORBUtilSystemException; import com.sun.corba.se.impl.copyobject.CopierManagerImpl; -import com.sun.corba.se.impl.presentation.rmi.PresentationManagerImpl; +import com.sun.corba.se.impl.ior.IORTypeCheckRegistryImpl; /** * The JavaIDL ORB implementation. @@ -226,6 +197,8 @@ private ServiceContextRegistry serviceContextRegistry ; + private IORTypeCheckRegistry iorTypeCheckRegistry; + // Needed here to implement connect/disconnect private TOAFactory toaFactory ; @@ -274,6 +247,8 @@ // insNamingDelegate. private final Object resolverLock = new Object() ; + private static final String IORTYPECHECKREGISTRY_FILTER_PROPNAME = "com.sun.CORBA.ORBIorTypeCheckRegistryFilter"; + private TaggedComponentFactoryFinder taggedComponentFactoryFinder ; private IdentifiableFactoryFinder taggedProfileFactoryFinder ; @@ -413,6 +388,37 @@ serviceContextRegistry = new ServiceContextRegistry( this ) ; } + private void initIORTypeCheckRegistry() { + String filterProps = AccessController + .doPrivileged(new PrivilegedAction<String>() { + public String run() { + String props = System + .getProperty(IORTYPECHECKREGISTRY_FILTER_PROPNAME); + if (props == null) { + props = Security + .getProperty(IORTYPECHECKREGISTRY_FILTER_PROPNAME); + } + return props; + } + }); + if (filterProps != null) { + try { + iorTypeCheckRegistry = new IORTypeCheckRegistryImpl(filterProps, this); + } catch (Exception ex) { + throw wrapper.bootstrapException(ex); + } + + if (this.orbInitDebugFlag) { + dprint(".initIORTypeCheckRegistry, IORTypeCheckRegistryImpl created for properties == " + + filterProps); + } + } else { + if (this.orbInitDebugFlag) { + dprint(".initIORTypeCheckRegistry, IORTypeCheckRegistryImpl NOT created for properties == "); + } + } + } + protected void setDebugFlags( String[] args ) { for (int ctr=0; ctr<args.length; ctr++ ) { @@ -494,6 +500,8 @@ getThreadPoolManager(); super.getByteBufferPool(); + + initIORTypeCheckRegistry(); } private synchronized POAFactory getPOAFactory() @@ -2089,6 +2097,17 @@ } return copierManager ; } + + @Override + public void validateIORClass(String iorClassName) { + if (iorTypeCheckRegistry != null) { + if (!iorTypeCheckRegistry.isValidIORType(iorClassName)) { + throw ORBUtilSystemException.get( this, + CORBALogDomains.OA_IOR ).badStringifiedIor(); + } + } + } + } // Class ORBImpl //////////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java --- old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java 2017-10-30 18:28:36.000000000 +0100 +++ new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java 2018-02-06 19:20:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,28 +31,16 @@ package com.sun.corba.se.impl.orb; -import java.util.Collection; import java.util.Properties; -import java.util.Hashtable; import java.applet.Applet; import java.net.URL; -import java.io.IOException ; - -import java.util.logging.Logger ; - -import org.omg.CORBA.Context; -import org.omg.CORBA.ContextList; -import org.omg.CORBA.Environment; -import org.omg.CORBA.ExceptionList; import org.omg.CORBA.ORBPackage.InvalidName; import org.omg.CORBA.NVList; import org.omg.CORBA.TCKind; -import org.omg.CORBA.NamedValue; import org.omg.CORBA.NO_IMPLEMENT; -import org.omg.CORBA.Object; import org.omg.CORBA.Request; import org.omg.CORBA.TypeCode; import org.omg.CORBA.Any; @@ -63,7 +51,6 @@ import org.omg.CORBA.PolicyError; import org.omg.CORBA.portable.OutputStream; -import org.omg.CORBA.portable.RemarshalException; import com.sun.corba.se.pept.protocol.ClientInvocationInfo ; import com.sun.corba.se.pept.transport.ContactInfo; @@ -71,15 +58,12 @@ import com.sun.corba.se.pept.transport.Selector ; import com.sun.corba.se.pept.transport.TransportManager; -import com.sun.corba.se.spi.legacy.connection.ORBSocketFactory; import com.sun.corba.se.spi.orb.ORBData; import com.sun.corba.se.spi.orb.Operation; import com.sun.corba.se.spi.orb.ORB; import com.sun.corba.se.spi.orb.ORBVersion; import com.sun.corba.se.spi.orb.ORBVersionFactory; import com.sun.corba.se.spi.oa.OAInvocationInfo; -import com.sun.corba.se.spi.oa.ObjectAdapter; -import com.sun.corba.se.spi.protocol.CorbaMessageMediator; import com.sun.corba.se.spi.protocol.ClientDelegateFactory; import com.sun.corba.se.spi.protocol.RequestDispatcherRegistry; import com.sun.corba.se.spi.protocol.CorbaServerRequestDispatcher; @@ -92,22 +76,17 @@ import com.sun.corba.se.spi.ior.ObjectKey; import com.sun.corba.se.spi.ior.ObjectKeyFactory; import com.sun.corba.se.spi.ior.iiop.GIOPVersion; -import com.sun.corba.se.pept.transport.ByteBufferPool ; import com.sun.corba.se.spi.transport.CorbaContactInfoListFactory ; import com.sun.corba.se.spi.transport.CorbaTransportManager; import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketManager; import com.sun.corba.se.spi.orbutil.closure.Closure; import com.sun.corba.se.spi.orbutil.threadpool.ThreadPoolManager; -import com.sun.corba.se.spi.logging.LogWrapperFactory; -import com.sun.corba.se.spi.logging.LogWrapperBase; import com.sun.corba.se.spi.copyobject.CopierManager; import com.sun.corba.se.spi.presentation.rmi.PresentationManager; import com.sun.corba.se.spi.presentation.rmi.PresentationDefaults; import com.sun.corba.se.spi.servicecontext.ServiceContextRegistry; -import com.sun.corba.se.spi.servicecontext.ServiceContexts; -import com.sun.corba.se.impl.corba.TypeCodeFactory; import com.sun.corba.se.impl.corba.TypeCodeImpl; import com.sun.corba.se.impl.corba.NVListImpl; import com.sun.corba.se.impl.corba.NamedValueImpl; @@ -117,9 +96,6 @@ import com.sun.corba.se.impl.corba.AnyImpl; import com.sun.corba.se.impl.encoding.BufferManagerFactory; import com.sun.corba.se.impl.encoding.CodeSetComponentInfo; -import com.sun.corba.se.impl.encoding.MarshalInputStream; -import com.sun.corba.se.impl.encoding.EncapsOutputStream; -import com.sun.corba.se.impl.encoding.MarshalOutputStream; import com.sun.corba.se.impl.oa.poa.BadServerIdHandler; import com.sun.corba.se.impl.orbutil.ORBConstants; import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketEndPointInfo; @@ -768,6 +744,12 @@ public CopierManager getCopierManager() { return null ; } + + @Override + public void validateIORClass(String iorClassName) { + getFullORB().validateIORClass(iorClassName); + } + } // End of file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/spi/ior/IORTypeCheckRegistry.java new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/spi/ior/IORTypeCheckRegistry.java --- old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/spi/ior/IORTypeCheckRegistry.java 1970-01-01 01:00:00.000000000 +0100 +++ new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/spi/ior/IORTypeCheckRegistry.java 2018-02-06 19:20:51.000000000 +0100 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.corba.se.spi.ior; + +public interface IORTypeCheckRegistry { + public boolean isValidIORType(String iorClassName); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/spi/orb/ORB.java new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/spi/orb/ORB.java --- old/corba-13a5a8a3c66f/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2017-10-30 18:28:36.000000000 +0100 +++ new/corba-872ca6c060bb/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2018-02-06 19:20:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,16 +42,13 @@ import com.sun.corba.se.spi.protocol.RequestDispatcherRegistry ; import com.sun.corba.se.spi.protocol.ClientDelegateFactory ; import com.sun.corba.se.spi.protocol.CorbaServerRequestDispatcher ; -import com.sun.corba.se.spi.protocol.CorbaMessageMediator ; import com.sun.corba.se.spi.protocol.PIHandler ; import com.sun.corba.se.spi.resolver.LocalResolver ; import com.sun.corba.se.spi.resolver.Resolver ; import com.sun.corba.se.spi.transport.CorbaContactInfoListFactory ; -import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketEndPointInfo; import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketManager; import com.sun.corba.se.spi.monitoring.MonitoringConstants; import com.sun.corba.se.spi.monitoring.MonitoringManager; -import com.sun.corba.se.spi.monitoring.MonitoringManagerFactory; import com.sun.corba.se.spi.monitoring.MonitoringFactories; import com.sun.corba.se.spi.ior.IdentifiableFactoryFinder ; @@ -60,8 +57,6 @@ import com.sun.corba.se.spi.ior.ObjectKeyFactory ; import com.sun.corba.se.spi.ior.IOR ; -import com.sun.corba.se.spi.orbutil.closure.Closure ; - import com.sun.corba.se.spi.orb.Operation ; import com.sun.corba.se.spi.orb.ORBData ; import com.sun.corba.se.spi.orb.ORBVersion ; @@ -135,6 +130,7 @@ public boolean shutdownDebugFlag = false; public boolean giopDebugFlag = false; public boolean invocationTimingDebugFlag = false ; + public boolean orbInitDebugFlag = false; // SystemException log wrappers. Protected so that they can be used in // subclasses. @@ -564,6 +560,24 @@ public abstract ThreadPoolManager getThreadPoolManager(); public abstract CopierManager getCopierManager() ; + + /* + * This method is called to verify that a stringified IOR passed to + * an org.omg.CORBA.ORB::string_to_object method contains a valid and acceptable IOR type. + * If an ORB is configured with IOR type checking enabled, + * the ORB executes a IOR type registry lookup to + * validate that the class name extract from a type id in + * a stringified IOR is a known and accepted type. + * A CORBA {@code org.omg.CORBA.DATA_CONVERSION} exception will be thrown should the type check fail. + * + * @param iorClassName + * a string representing the class name corresponding to the type id of an IOR + * @throws org.omg.CORBA.DATA_CONVERSION + * exception with an indication that it is a "Bad stringified IOR", which is thrown + * when the type check fails. + */ + public abstract void validateIORClass(String iorClassName); + } // End of file. ++++++ hotspot.tar.xz ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/hotspot.tar.xz /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/hotspot.tar.xz differ: char 26, line 1 ++++++ icedtea-3.6.0.tar.xz -> icedtea-3.7.0.tar.xz ++++++ ++++ 3835 lines of diff (skipped) ++++++ java-atk-wrapper-security.patch ++++++ --- /var/tmp/diff_new_pack.0WxdUX/_old 2018-03-02 21:09:55.208798676 +0100 +++ /var/tmp/diff_new_pack.0WxdUX/_new 2018-03-02 21:09:55.208798676 +0100 @@ -1,9 +1,9 @@ --- openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-15 23:08:27.000000000 +0200 +++ openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-18 09:04:45.127566697 +0200 -@@ -211,7 +211,9 @@ - jdk.internal.,\ +@@ -227,7 +227,9 @@ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ + jdk.xml.internal.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + org.GNOME.Accessibility.,\ @@ -11,10 +11,10 @@ # # List of comma-separated packages that start with or equal this string -@@ -258,7 +260,9 @@ - jdk.internal.,\ +@@ -277,7 +279,9 @@ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ + jdk.xml.internal.,\ - com.sun.activation.registries. + com.sun.activation.registries.,\ + org.GNOME.Accessibility.,\ ++++++ jaxp.tar.xz ++++++ ++++ 8847 lines of diff (skipped) ++++++ jaxws.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/.hgtags new/jaxws-3f0a3aea44b4/.hgtags --- old/jaxws-eafb356c44d0/.hgtags 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/.hgtags 2018-02-06 19:20:55.000000000 +0100 @@ -685,6 +685,8 @@ d82dd7a24a496e26987caa328d1fb4fc794a4770 jdk8u112-b16 b97cf465bf9f4b4b9f7c19fabeaa7e54f248451f icedtea-3.3.0pre01 021da5d50285a523d4622a727ea1a7019f2b52e4 jdk8u112-b31 +4d1398900b3745c3181450e981ed45696a1c97fc jdk8u112-b32 +424b6ee9ade3f63228867933fe8a995880379b97 jdk8u112-b33 452662a83e5bc6dc7e9425ddd10f6c8fc98d50d8 jdk8u121-b00 9cd16be39ca6f2c8f7cc99ad07a77bb9d0696c75 jdk8u121-b01 f092b9a890ceeca4a2f4d55cf7d6f3f113cdb462 jdk8u121-b02 @@ -702,6 +704,12 @@ 5f5237104669ce0a726ffc6769fa29a55b0174a8 icedtea-3.3.0 30f2a833a54f3c2e8791890ad88a84a581c620d9 icedtea-3.4.0pre01 5b8834cc3bb9e24153319c766e04e194945a61b9 jdk8u121-b13 +33c7a7def0d76bf508fe4d0a5261027d60bc272f jdk8u121-b31 +c946a5cc042f78c054943783d94cdb403c470e8f jdk8u121-b32 +159698a1ab4171fc9aa11dc43068390a7938c8dd jdk8u121-b33 +69fb2260636bf93b9d47c1699e899cd6e4e62bde jdk8u121-b34 +55de76c196f3efa65b86d4daae842837c9c86d4e jdk8u121-b35 +9e1b967463b26fb48a72fdb016f781d7b607d863 jdk8u121-b36 2359a73f36ca99ba30aef88a38936f6f4e18e65c jdk8u131-b00 bc5500cde753aed78c92e7301548fa1450c9b104 jdk8u131-b01 c146d8a61d677fd4d07778d0295b4e88e16a7dd3 jdk8u131-b02 @@ -716,6 +724,10 @@ c1bfc2395c57e2ceae8658883356f437ec5ed7c5 icedtea-3.4.0 18b3704bc51d5b4f7d31faf8e8aebb2f6c69b014 icedtea-3.5.0pre01 7817f0d2519573e42405ef96a7c7ff1d768f92ec jdk8u131-b11 +a432391b6d676847cf83ddacc1d6e42fc6435ac4 jdk8u131-b31 +cede0cc0bbe9641d70171e062d6b1ed9e52f2ebb jdk8u131-b32 +46788dc162ad09e11da8c4368d3371b06fb7ec63 jdk8u131-b33 +d5c5a205d7fb0a0b906d23e4aaf9dcdbb9ecfe7c jdk8u131-b34 74aa403ef03d56469e9364cc45c2ec18c6e50e33 jdk8u141-b00 b1138396b99b1f8ebdb7d28c7143c96eb5b4f991 jdk8u141-b01 a7b9281956f9616eab0498386b9605853db7b408 jdk8u141-b02 @@ -739,6 +751,14 @@ 4fb91927293516e83de8047c99a71aceeea452e9 icedtea-3.6.0pre01 768279d73ebb3a96825e365eb6999abaa991c64a icedtea-3.6.0pre02 d2226ba553ca545f9bf9ffa66254478faca378a2 jdk8u144-b01 +c5788159081fc767d8c73fefde96bc0ad99eee65 jdk8u141-b31 +e6c85f5c962a5039101cd045b5251f2e92312a5f jdk8u141-b32 +c57e086660a37470793e38b94d7abedb79489ce3 jdk8u144-b00 +d2226ba553ca545f9bf9ffa66254478faca378a2 jdk8u144-b01 +3daeca3e0cc20f90e1141038d990778956e2e149 jdk8u144-b31 +1eca5369bc47eecb908e1e818633699b59d12560 jdk8u144-b32 +db9bcdd55081c332f0ec464749e26f501f426b9f jdk8u144-b33 +9c7a086265429c23e4f49f0329eb4f65698492e3 jdk8u144-b34 eb09a34966f43c62cb286c78c10dc722fd12d884 jdk8u151-b00 c59814f445e808150326012d911b5b4d8caa025b jdk8u151-b01 d3dec37780f84151b08c03a6a8cba7d68bde0f80 jdk8u151-b02 @@ -751,3 +771,73 @@ 373e5d67f1f374a10d39e95963569db3949539e6 jdk8u151-b09 f910c0bf9da82c7b1f10903f2e76eeee0a2e20be jdk8u151-b10 3d15802f4ed80eb489bf0b25bff552bcf831276e jdk8u151-b11 +eafb356c44d000be9dba0c8d546b569605d0ccfe icedtea-3.6.0 +cce697096465ebb06fc18835c355ba3ae265042b jdk8u151-b12 +ea4b3e983ee708f9323d228044176e52526e9e13 jdk8u122-b00 +2e7f62568785adfe695e0c06f2e88c9d369c3b2c jdk8u122-b01 +b97e1b7f3c92b3e9f75e6aa590e0884c3c3ed33f jdk8u122-b02 +30b5b545a78c0c4fee837664f9c70ef6a2b4f0c1 jdk8u122-b03 +30b5b545a78c0c4fee837664f9c70ef6a2b4f0c1 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +a127c3268266ba1402343d94c7b19355c2dd1bd7 jdk8u122-b03 +c48501ec74b9b03870b473e5bde656fce230fc36 jdk8u122-b04 +f3b3163dda3c6da9339dba99a2ee74645ad2edc6 jdk8u132-b00 +55cb39946f2f163085ca80413b8cd3b3e196e533 jdk8u152-b00 +cf960a33b0e3093abcb48bfe304d471e3b092dc4 jdk8u152-b01 +0b4a7ce47e597b8d33e590857384a478c69a9e6f jdk8u152-b02 +98c698b1b09b6a31d5090a25aff8b7a6edb8d6ba jdk8u152-b03 +bcf7fc55388e4c9d771cd2ad38351a66bfcf27d9 jdk8u152-b04 +388cd26b19dbf7d3102653dd82c27027cd722066 jdk8u152-b05 +199a8d03dde0da505f04c87ff72aabdd7022eec5 jdk8u152-b06 +488a01f4ba30dc2eb7205a2800a37ade74cc3ad1 jdk8u152-b07 +86c8e64c0df3e7f18cc98e820b08dde3b67ffabb jdk8u152-b08 +bedae7043858b1e2cdef09d5dd68f4585320b5df jdk8u152-b09 +e2061fccf2caaab7c4dea3fb5b0a34d883821ce4 jdk8u152-b10 +4dc85ca7179702344f298f33c8373ee335dea82c jdk8u152-b11 +e14e868648cdc00abd3aa40aeee2c14afcfe0cd3 jdk8u152-b12 +62481eff71d45189ed8138ee00fa51b10671f2cf jdk8u152-b13 +ef939329cecb82b62d75d76debc5d67246333edd jdk8u152-b14 +199f7d9827f96ee2393f947405473b68372c0757 jdk8u152-b15 +184d3d9543efa5f8a2fc44d7b202e071cae5e980 icedtea-3.7.0pre01 +04128156e506e8375c1c97eafea773317e5719bc jdk8u152-b16 +eb09a34966f43c62cb286c78c10dc722fd12d884 jdk8u151-b00 +c59814f445e808150326012d911b5b4d8caa025b jdk8u151-b01 +d3dec37780f84151b08c03a6a8cba7d68bde0f80 jdk8u151-b02 +32a01bf45f0f32783a5c98e5f68feb9a6e1ffd16 jdk8u161-b00 +4c06ef2757dedeffa5f61acad42c36cbb3496e69 jdk8u151-b03 +04a80aaab394ef20a3cdfcd04f1498349f691738 jdk8u151-b04 +730acb5d508e3cb852c2dae222717aa4593e6bb9 jdk8u151-b05 +2abea38c7ccedf1eabe9245ca9619cd006484a07 jdk8u151-b06 +ea4b3e983ee708f9323d228044176e52526e9e13 jdk8u122-b00 +2e7f62568785adfe695e0c06f2e88c9d369c3b2c jdk8u122-b01 +b97e1b7f3c92b3e9f75e6aa590e0884c3c3ed33f jdk8u122-b02 +30b5b545a78c0c4fee837664f9c70ef6a2b4f0c1 jdk8u122-b03 +30b5b545a78c0c4fee837664f9c70ef6a2b4f0c1 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +a127c3268266ba1402343d94c7b19355c2dd1bd7 jdk8u122-b03 +c48501ec74b9b03870b473e5bde656fce230fc36 jdk8u122-b04 +f3b3163dda3c6da9339dba99a2ee74645ad2edc6 jdk8u132-b00 +55cb39946f2f163085ca80413b8cd3b3e196e533 jdk8u152-b00 +cf960a33b0e3093abcb48bfe304d471e3b092dc4 jdk8u152-b01 +0b4a7ce47e597b8d33e590857384a478c69a9e6f jdk8u152-b02 +98c698b1b09b6a31d5090a25aff8b7a6edb8d6ba jdk8u152-b03 +bcf7fc55388e4c9d771cd2ad38351a66bfcf27d9 jdk8u152-b04 +388cd26b19dbf7d3102653dd82c27027cd722066 jdk8u152-b05 +199a8d03dde0da505f04c87ff72aabdd7022eec5 jdk8u152-b06 +488a01f4ba30dc2eb7205a2800a37ade74cc3ad1 jdk8u152-b07 +86c8e64c0df3e7f18cc98e820b08dde3b67ffabb jdk8u152-b08 +bedae7043858b1e2cdef09d5dd68f4585320b5df jdk8u152-b09 +32a01bf45f0f32783a5c98e5f68feb9a6e1ffd16 jdk8u161-b00 +d69b55e7aee8c5c9f3a4f73a0bb89943f6dca4fa jdk8u161-b01 +b43391a4015f0c890c90ab33fe03b941876d2ee6 jdk8u161-b02 +d9877e4e1f2b84201aa431e82fce648e69f02e65 jdk8u161-b03 +df10b5ca4d33be24ac11ab2be1810c0368d9eba7 jdk8u161-b04 +1e4379566867606b9b24d4b3708c50f814515c21 jdk8u161-b05 +789b5e487e9c7d16e4fb1117d78dddeda52c8556 jdk8u161-b06 +956306dd4697b96ee33a5e2c6c21956a9a42619f jdk8u161-b07 +b0cea01f48182c91a5851c4c26819ce61a217688 jdk8u161-b08 +0e66110407e3da3297c4526bd849181c6d7ba758 jdk8u161-b09 +d26c2b6db981746f7870e7c246200fb8c70f4c91 jdk8u161-b10 +4c61299e4daf6727d736e23f03ecb2947b3e9609 jdk8u161-b11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/ASSEMBLY_EXCEPTION new/jaxws-3f0a3aea44b4/ASSEMBLY_EXCEPTION --- old/jaxws-eafb356c44d0/ASSEMBLY_EXCEPTION 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/ASSEMBLY_EXCEPTION 2018-02-06 19:20:55.000000000 +0100 @@ -1,27 +1,27 @@ OPENJDK ASSEMBLY EXCEPTION -The OpenJDK source code made available by Sun at openjdk.java.net and -openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the -GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 +The OpenJDK source code made available by Oracle America, Inc. (Oracle) at +openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU +General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 only ("GPL2"), with the following clarification and special exception. Linking this OpenJDK Code statically or dynamically with other code is making a combined work based on this library. Thus, the terms and conditions of GPL2 cover the whole combination. - As a special exception, Sun gives you permission to link this - OpenJDK Code with certain code licensed by Sun as indicated at + As a special exception, Oracle gives you permission to link this + OpenJDK Code with certain code licensed by Oracle as indicated at http://openjdk.java.net/legal/exception-modules-2007-05-08.html ("Designated Exception Modules") to produce an executable, regardless of the license terms of the Designated Exception Modules, and to copy and distribute the resulting executable under GPL2, provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Sun. + governed by the licenses under which they were offered by Oracle. -As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to -build an executable that includes those portions of necessary code that Sun -could not provide under GPL2 (or that Sun has provided under GPL2 with the -Classpath exception). If you modify or add to the OpenJDK code, that new -GPL2 code may still be combined with Designated Exception Modules if the -new code is made subject to this exception by its copyright holder. +As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code +to build an executable that includes those portions of necessary code that +Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 +with the Classpath exception). If you modify or add to the OpenJDK code, +that new GPL2 code may still be combined with Designated Exception Modules +if the new code is made subject to this exception by its copyright holder. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/THIRD_PARTY_README new/jaxws-3f0a3aea44b4/THIRD_PARTY_README --- old/jaxws-eafb356c44d0/THIRD_PARTY_README 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/THIRD_PARTY_README 2018-02-06 19:20:55.000000000 +0100 @@ -7,7 +7,7 @@ --- begin of LICENSE --- -Copyright (c) 2000-2011 France Télécom +Copyright (c) 2000-2011 France T??l??com All rights reserved. Redistribution and use in source and binary forms, with or without @@ -849,7 +849,7 @@ --- begin of LICENSE --- Copyright notice -Copyright © 2011 Ecma International +Copyright ?? 2011 Ecma International Ecma International Rue du Rhone 114 CH-1204 Geneva @@ -916,7 +916,7 @@ --- begin of LICENSE --- -Copyright © 2001,2003 Keith Packard +Copyright ?? 2001,2003 Keith Packard Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the @@ -2212,16 +2212,16 @@ Unicode Terms of Use For the general privacy policy governing access to this site, see the Unicode -Privacy Policy. For trademark usage, see the Unicode® Consortium Name and +Privacy Policy. For trademark usage, see the Unicode?? Consortium Name and Trademark Usage Policy. A. Unicode Copyright. - 1. Copyright © 1991-2013 Unicode, Inc. All rights reserved. + 1. Copyright ?? 1991-2013 Unicode, Inc. All rights reserved. 2. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative - works conforming to the Unicode® Standard, subject to Terms and + works conforming to the Unicode?? Standard, subject to Terms and Conditions herein. 3. Any person is hereby authorized, without fee, to view, use, reproduce, @@ -2287,14 +2287,14 @@ E.Trademarks & Logos. 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, - Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of + Inc. ???The Unicode Consortium??? and ???Unicode, Inc.??? are trade names of Unicode, Inc. Use of the information and materials found on this - website indicates your acknowledgement of Unicode, Inc.’s exclusive + website indicates your acknowledgement of Unicode, Inc.???s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names. - 2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark - Policy”) are incorporated herein by reference and you agree to abide by + 2. The Unicode Consortium Name and Trademark Usage Policy (???Trademark + Policy???) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. @@ -2317,12 +2317,12 @@ 2. Modification by Unicode. Unicode shall have the right to modify this Agreement at any time by posting it to this site. The user may not - assign any part of this Agreement without Unicode’s prior written + assign any part of this Agreement without Unicode???s prior written consent. 3. Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on - Unicode’s net income. + Unicode???s net income. 4. Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain @@ -2351,7 +2351,7 @@ COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the +Copyright ?? 1991-2012 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining a copy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java 1970-01-01 01:00:00.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java 2018-02-06 19:20:55.000000000 +0100 @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.xml.internal.bind.marshaller; + +import java.io.IOException; +import java.io.Writer; + +/** + * Performs no character escaping. + * + * @author + * Roman Grigoriadi (roman.grigoriadi(a)oracle.com) + */ +public class NoEscapeHandler implements CharacterEscapeHandler { + + public static final NoEscapeHandler theInstance = new NoEscapeHandler(); + + @Override + public void escape(char[] ch, int start, int length, boolean isAttVal, Writer out) throws IOException { + out.write(ch, start, length); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -76,7 +76,7 @@ public void marshal(Marshaller _m, T t, XMLStreamWriter output) throws JAXBException { MarshallerImpl m = (MarshallerImpl)_m; - m.write(tagName,bi,t,XMLStreamWriterOutput.create(output,context),new StAXPostInitAction(output,m.serializer)); + m.write(tagName,bi,t,XMLStreamWriterOutput.create(output,context, m.getEscapeHandler()),new StAXPostInitAction(output,m.serializer)); } public void marshal(Marshaller _m, T t, OutputStream output, NamespaceContext nsContext) throws JAXBException { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -160,7 +160,7 @@ @Override public void marshal(Object obj, XMLStreamWriter writer) throws JAXBException { - write(obj, XMLStreamWriterOutput.create(writer,context), new StAXPostInitAction(writer,serializer)); + write(obj, XMLStreamWriterOutput.create(writer,context, escapeHandler), new StAXPostInitAction(writer,serializer)); } @Override @@ -364,6 +364,15 @@ } + /** + * Returns escape handler provided with JAXB context parameters. + * + * @return escape handler + */ + CharacterEscapeHandler getEscapeHandler() { + return escapeHandler; + } + // // // create XMLWriter by specifing various type of output. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ package com.sun.xml.internal.bind.v2.runtime.output; +import com.sun.xml.internal.bind.marshaller.NoEscapeHandler; import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl; import com.sun.xml.internal.bind.v2.runtime.Name; import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; @@ -220,7 +221,7 @@ public FastInfosetStreamWriterOutput(StAXDocumentSerializer out, JAXBContextImpl context) { - super(out); + super(out, NoEscapeHandler.theInstance); this.fiout = out; this.localNames = context.getUTF8NameTable(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,7 @@ import javax.xml.stream.XMLStreamException; +import com.sun.xml.internal.bind.marshaller.NoEscapeHandler; import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data; import com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx; @@ -40,7 +41,7 @@ private final XMLStreamWriterEx out; public StAXExStreamWriterOutput(XMLStreamWriterEx out) { - super(out); + super(out, NoEscapeHandler.theInstance); this.out = out; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,15 +26,16 @@ package com.sun.xml.internal.bind.v2.runtime.output; import java.io.IOException; +import java.io.Writer; import java.lang.reflect.Constructor; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; +import com.sun.xml.internal.bind.marshaller.CharacterEscapeHandler; import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl; import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; -import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallerImpl; import org.xml.sax.SAXException; /** @@ -53,7 +54,7 @@ * Creates a new {@link XmlOutput} from a {@link XMLStreamWriter}. * This method recognizes an FI StAX writer. */ - public static XmlOutput create(XMLStreamWriter out, JAXBContextImpl context) { + public static XmlOutput create(XMLStreamWriter out, JAXBContextImpl context, CharacterEscapeHandler escapeHandler) { // try optimized path final Class writerClass = out.getClass(); if (writerClass==FI_STAX_WRITER_CLASS) { @@ -69,17 +70,26 @@ } } + CharacterEscapeHandler xmlStreamEscapeHandler = escapeHandler != null ? + escapeHandler : NewLineEscapeHandler.theInstance; + // otherwise the normal writer. - return new XMLStreamWriterOutput(out); + return new XMLStreamWriterOutput(out, xmlStreamEscapeHandler); } private final XMLStreamWriter out; + private final CharacterEscapeHandler escapeHandler; + + private final XmlStreamOutWriterAdapter writerWrapper; + protected final char[] buf = new char[256]; - protected XMLStreamWriterOutput(XMLStreamWriter out) { + protected XMLStreamWriterOutput(XMLStreamWriter out, CharacterEscapeHandler escapeHandler) { this.out = out; + this.escapeHandler = escapeHandler; + this.writerWrapper = new XmlStreamOutWriterAdapter(out); } // not called if we are generating fragments @@ -137,7 +147,7 @@ public void text(String value, boolean needsSeparatingWhitespace) throws IOException, SAXException, XMLStreamException { if(needsSeparatingWhitespace) out.writeCharacters(" "); - out.writeCharacters(value); + escapeHandler.escape(value.toCharArray(), 0, value.length(), false, writerWrapper); } public void text(Pcdata value, boolean needsSeparatingWhitespace) throws IOException, SAXException, XMLStreamException { @@ -207,4 +217,82 @@ } } + + /** + * Performs character escaping only for new lines. + */ + private static class NewLineEscapeHandler implements CharacterEscapeHandler { + + public static final NewLineEscapeHandler theInstance = new NewLineEscapeHandler(); + + @Override + public void escape(char[] ch, int start, int length, boolean isAttVal, Writer out) throws IOException { + int limit = start+length; + int lastEscaped = start; + + for (int i = start; i < limit; i++) { + char c = ch[i]; + if (c == '\r' || c == '\n') { + if (i != lastEscaped) { + out.write(ch, lastEscaped, i - lastEscaped); + } + lastEscaped = i + 1; + if (out instanceof XmlStreamOutWriterAdapter) { + try { + ((XmlStreamOutWriterAdapter)out).writeEntityRef("#x" + Integer.toHexString(c)); + } catch (XMLStreamException e) { + throw new IOException("Error writing xml stream", e); + } + } else { + out.write("&#x"); + out.write(Integer.toHexString(c)); + out.write(';'); + } + } + } + if (lastEscaped != limit) { + out.write(ch, lastEscaped, length - lastEscaped); + } + } + } + + private static final class XmlStreamOutWriterAdapter extends Writer { + + private final XMLStreamWriter writer; + + private XmlStreamOutWriterAdapter(XMLStreamWriter writer) { + this.writer = writer; + } + + @Override + public void write(char[] cbuf, int off, int len) throws IOException { + try { + writer.writeCharacters(cbuf, off, len); + } catch (XMLStreamException e) { + throw new IOException("Error writing XML stream", e); + } + } + + public void writeEntityRef(String entityReference) throws XMLStreamException { + writer.writeEntityRef(entityReference); + } + + @Override + public void flush() throws IOException { + try { + writer.flush(); + } catch (XMLStreamException e) { + throw new IOException("Error flushing XML stream", e); + } + } + + @Override + public void close() throws IOException { + try { + writer.close(); + } catch (XMLStreamException e) { + throw new IOException("Error closing XML stream", e); + } + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,22 +25,15 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class attributeDeclBody extends NGCCHandler { private String name; @@ -458,7 +451,7 @@ break; case 11: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 10; } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,22 +25,14 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class attributeGroupDecl extends NGCCHandler { private AnnotationImpl annotation; @@ -401,7 +393,7 @@ break; case 12: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 11; } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,22 +25,17 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; +import java.util.Collections; +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class complexType extends NGCCHandler { private Integer finalValue; @@ -1683,7 +1678,7 @@ break; case 70: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 69; } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,22 +25,18 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; +import java.util.ArrayList; +import java.util.List; +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class elementDeclBody extends NGCCHandler { private Integer finalValue; @@ -813,7 +809,7 @@ break; case 22: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 21; } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,22 +25,15 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class group extends NGCCHandler { private AnnotationImpl annotation; @@ -403,7 +396,7 @@ break; case 9: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 8; } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,22 +25,18 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; +import java.util.ArrayList; +import java.util.List; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; class identityConstraint extends NGCCHandler { private String name; @@ -471,7 +467,7 @@ switch($_ngcc_current_state) { case 15: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 14; } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,22 +25,16 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class notation extends NGCCHandler { private String name; @@ -435,7 +429,7 @@ break; case 13: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 12; } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,22 +25,12 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; class qname extends NGCCHandler { private String qvalue; @@ -150,7 +140,7 @@ break; case 1: { - qvalue = $value; + qvalue = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 0; } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java --- old/jaxws-eafb356c44d0/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java 2017-10-30 18:28:37.000000000 +0100 +++ new/jaxws-3f0a3aea44b4/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java 2018-02-06 19:20:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,22 +25,21 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.StringTokenizer; +import org.xml.sax.Attributes; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; class simpleType extends NGCCHandler { private AnnotationImpl annotation; @@ -373,7 +372,7 @@ switch($_ngcc_current_state) { case 13: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 12; } break; ++++++ jdk.tar.xz ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/jdk.tar.xz /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/jdk.tar.xz differ: char 26, line 1 ++++++ langtools.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-61a1c711f7ab/.hgtags new/langtools-0a2dce555d35/.hgtags --- old/langtools-61a1c711f7ab/.hgtags 2017-10-30 18:28:37.000000000 +0100 +++ new/langtools-0a2dce555d35/.hgtags 2018-02-06 19:20:59.000000000 +0100 @@ -693,6 +693,8 @@ ee37eafc48cb6fb20cb6c1e31cfecfe1ccc800da jdk8u112-b16 3ab9841babb7f624ae830024e42e75344a4fed5a icedtea-3.3.0pre01 de1c3df992adb0c704005583210d1ed6dac758cd jdk8u112-b31 +c94fd1b737d005962ba62fa03106de791692f39c jdk8u112-b32 +721ea56edf4196b37a081ac47206202d7560e16c jdk8u112-b33 5710d574a99aeff3600c49a4aed34fa1b373f7b8 jdk8u121-b00 ab5d32d8cf5f6d81482692f801385a869b2d83c1 jdk8u121-b01 e260d46661d2da3ede78aae434d5420acce99950 jdk8u121-b02 @@ -710,6 +712,12 @@ d10a13bdc98ca6a44ef27059c8403162a7059197 icedtea-3.3.0 a3d47fe59cc4a4d7956d68c93862c2ce1e1062f0 icedtea-3.4.0pre01 f634736433d9fc1cffbdc55611f97ecb2cd44059 jdk8u121-b13 +1dc3121986c615c2ac1f5e7d6705b197c5dfcae6 jdk8u121-b31 +970edd6f01b76e916cf223fbc53dcef085a0255b jdk8u121-b32 +edc3e462837bcc5916a2aace14e6b137ba88d4b6 jdk8u121-b33 +ae7a4fec2fd96e417285536967aa8eff6442df23 jdk8u121-b34 +8bcb0ed6a82367e0a40c9cda20720b34441f7846 jdk8u121-b35 +176bae232abb77c08c4dcafba5a44e4dac941127 jdk8u121-b36 8b331e7199f74a2dea8a8a866f0d7f1977f146ee jdk8u131-b00 0d04068f82fe680c65619e08ef012ead7483873b jdk8u131-b01 452448c6347af8f7bd827dd4632ac06c991a15b8 jdk8u131-b02 @@ -724,6 +732,10 @@ 4ef0ee9279400d2574e34afa84b74936d337573e icedtea-3.4.0 40fe2817d64898ec28391091ba3c4e6d5124bdc0 icedtea-3.5.0pre01 5162417b51bdf68b95696198181f2e662a14ff8a jdk8u131-b11 +12f40d1f41c2cea8b61d046796a753000e61196f jdk8u131-b31 +508e7f6446deede595bbdbdc6d6cf9fc1ae8e728 jdk8u131-b32 +df2b65224ab78a312559ae3054aeb3ef73abaf9e jdk8u131-b33 +08a21473de54fd89fd53a01351cad954f60d2652 jdk8u131-b34 1175fac90fdbbd864f7b1f306397644d26eb9781 jdk8u141-b00 bb163efa3276e129c69bad28299a6283b869caa3 jdk8u141-b01 5864e3781953daa69efd54b329a358a568229268 jdk8u141-b02 @@ -747,6 +759,14 @@ 74bbbc7a8bd30cdc472fe93c2938182322825b2a icedtea-3.6.0pre01 e0f1c298f0d664b90d68f9a775441be66ea1e3f3 icedtea-3.6.0pre02 816907853a15d9b22a87032d07327a400f8568b3 jdk8u144-b01 +716e712f0db45c8231208bc70ab4d2a8a40c4d3a jdk8u141-b31 +09c2459991619ef7061ad2bc66373ed29f500acf jdk8u141-b32 +4c355f7002c36bb626b42d5c1d42ea91d77ba5d6 jdk8u144-b00 +816907853a15d9b22a87032d07327a400f8568b3 jdk8u144-b01 +e678eb754806df4be677ee27fe235968124faa6a jdk8u144-b31 +b648127ee8c6b24376a95080eb0d2676007844d0 jdk8u144-b32 +ab9162feb67c00f5074bbaf3882d171b0cf16dad jdk8u144-b33 +e8b3bd888e5219ea7ed92cf160598b9ea9215916 jdk8u144-b34 4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00 f081adae3486f8728affc89213c2cd1dd0ac9467 jdk8u151-b01 732e1bab2660d21227dce26190d4a31dd9785a7f jdk8u151-b02 @@ -759,3 +779,92 @@ c686a7fe765ec746c514618bae61dfc1570ce5b5 jdk8u151-b09 8fb1d9ffc81c4bb6e08330726995b9b8f2b694a1 jdk8u151-b10 607b049fabd1352893470463dfb455e0a407687d jdk8u151-b11 +61a1c711f7abeb66195623343c1cd08b0df2dc1d icedtea-3.6.0 +8559c5805c2b091e2122dff3d04c7342cd15560c jdk8u151-b12 +9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00 +85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01 +2baeb96fa198f75e9bd50a5f5ef4a19be6cfbc4e jdk8u122-b02 +a5da608d17bdc073fd3a4f2e1d4fe7d526567d09 jdk8u122-b03 +a5da608d17bdc073fd3a4f2e1d4fe7d526567d09 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +18bfe5da1f56c6932cce6378f617904db68bedcd jdk8u122-b03 +5ce29dae0e3e11bbecbc2173479ccf0a06b7d556 jdk8u122-b04 +9229942f9ee2ad7c5b8d57cddcb9011aac6bac23 jdk8u132-b00 +03e31cfcd499360c2db8eeccacc77ee040e71bac jdk8u152-b00 +f47b61665c6fefb5eba2504d5e312004d59f0483 jdk8u152-b01 +a283fc8f44acc956fbc4192d546216c4638e7146 jdk8u152-b02 +2783ff53e49dec0e7939b54aeb302605725e1017 jdk8u152-b03 +71e344b8e2c237dd7ef7c5f4276030e2880a6e07 jdk8u152-b04 +38bb14529d829cc290439a712b9821cd0e272f7e jdk8u152-b05 +243671be7d4e0a4f71c0f88add12695ac86295cb jdk8u152-b06 +a2cc6d348025da4b72c7b18edcc5fc9e046803da jdk8u152-b07 +19eec1de09c1fef1392593284eb9d2c5becd6663 jdk8u152-b08 +ca6375d1a8b2ba3c086746a2bca65015a1a12146 jdk8u152-b09 +abdab2b0bfdbda42030083e99e903bd663cafda3 jdk8u152-b10 +b0aba5c25f8b366fbe93ee19f2f60f863b603967 jdk8u152-b11 +b83ee184e012c5a4eb8989f55216d186d9f5aaaa jdk8u152-b12 +afbf7275401383d6dbbd54149a8985f510f57d7d jdk8u152-b13 +752a7260bb1977979243aa8dd9a588787237662e jdk8u152-b14 +8c2463d627e3cf513522ba32bf71624c880beb91 jdk8u152-b15 +e32341052fe1cd792639b9e0ac48972a2e133a17 icedtea-3.7.0pre01 +97dfb267d417415aca378f62b97dbf7a12a93f8a jdk8u152-b16 +4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00 +f081adae3486f8728affc89213c2cd1dd0ac9467 jdk8u151-b01 +732e1bab2660d21227dce26190d4a31dd9785a7f jdk8u151-b02 +a1d0ecd858bbc397f7683a9e0a3fd1620c327d64 jdk8u151-b03 +d0a51eb7da2995e864af5dc4d010aef0cb3f9e38 jdk8u151-b04 +e0ed0609963aca47e766901d7ec57ab97b649567 jdk8u151-b05 +ff824edbfa4dc81b6f2b5c33e4027806fd149304 jdk8u151-b06 +9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00 +85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01 +2baeb96fa198f75e9bd50a5f5ef4a19be6cfbc4e jdk8u122-b02 +a5da608d17bdc073fd3a4f2e1d4fe7d526567d09 jdk8u122-b03 +a5da608d17bdc073fd3a4f2e1d4fe7d526567d09 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +18bfe5da1f56c6932cce6378f617904db68bedcd jdk8u122-b03 +5ce29dae0e3e11bbecbc2173479ccf0a06b7d556 jdk8u122-b04 +9229942f9ee2ad7c5b8d57cddcb9011aac6bac23 jdk8u132-b00 +03e31cfcd499360c2db8eeccacc77ee040e71bac jdk8u152-b00 +f47b61665c6fefb5eba2504d5e312004d59f0483 jdk8u152-b01 +a283fc8f44acc956fbc4192d546216c4638e7146 jdk8u152-b02 +2783ff53e49dec0e7939b54aeb302605725e1017 jdk8u152-b03 +71e344b8e2c237dd7ef7c5f4276030e2880a6e07 jdk8u152-b04 +38bb14529d829cc290439a712b9821cd0e272f7e jdk8u152-b05 +243671be7d4e0a4f71c0f88add12695ac86295cb jdk8u152-b06 +a2cc6d348025da4b72c7b18edcc5fc9e046803da jdk8u152-b07 +19eec1de09c1fef1392593284eb9d2c5becd6663 jdk8u152-b08 +ca6375d1a8b2ba3c086746a2bca65015a1a12146 jdk8u152-b09 +4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00 +a1d0ecd858bbc397f7683a9e0a3fd1620c327d64 jdk8u151-b03 +9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00 +85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01 +2baeb96fa198f75e9bd50a5f5ef4a19be6cfbc4e jdk8u122-b02 +a5da608d17bdc073fd3a4f2e1d4fe7d526567d09 jdk8u122-b03 +a5da608d17bdc073fd3a4f2e1d4fe7d526567d09 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +18bfe5da1f56c6932cce6378f617904db68bedcd jdk8u122-b03 +5ce29dae0e3e11bbecbc2173479ccf0a06b7d556 jdk8u122-b04 +9229942f9ee2ad7c5b8d57cddcb9011aac6bac23 jdk8u132-b00 +03e31cfcd499360c2db8eeccacc77ee040e71bac jdk8u152-b00 +f47b61665c6fefb5eba2504d5e312004d59f0483 jdk8u152-b01 +a283fc8f44acc956fbc4192d546216c4638e7146 jdk8u152-b02 +2783ff53e49dec0e7939b54aeb302605725e1017 jdk8u152-b03 +71e344b8e2c237dd7ef7c5f4276030e2880a6e07 jdk8u152-b04 +38bb14529d829cc290439a712b9821cd0e272f7e jdk8u152-b05 +243671be7d4e0a4f71c0f88add12695ac86295cb jdk8u152-b06 +4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00 +af48981bdd47e86656dfdc6b675fbd5caeabd843 jdk8u161-b00 +63426c18e9c269af515533122beca9707cc18e7b jdk8u161-b01 +c18e76a704169bfdaeb498f6cb46c99251793e19 jdk8u161-b02 +a9ed1dba7dd19b8886b6fd0e6fde3e1ef1a78789 jdk8u161-b03 +17507635a86dd95b0a76a59e8ff80d92510844df jdk8u161-b04 +102179740625431f80fb33c078b344c771528daa jdk8u161-b05 +9d6ebf514475c90019ed352bf207ca28e3f294af jdk8u161-b06 +cb6f7d27f97c64fe4076e321a6e49cf2dc40f939 jdk8u161-b07 +36cd8cee9f0cf803923fb310d9fe4362787f750e jdk8u161-b08 +96cdc8b62d5f7263a0c42bc21bf85a205cb75ebb jdk8u161-b09 +cfc40ab214f9174edbb08925a39efd081d6e4b34 jdk8u161-b10 +44fd88d9e5ae96d54e6d993dae14d6f2ab53b5c1 jdk8u161-b11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-61a1c711f7ab/ASSEMBLY_EXCEPTION new/langtools-0a2dce555d35/ASSEMBLY_EXCEPTION --- old/langtools-61a1c711f7ab/ASSEMBLY_EXCEPTION 2017-10-30 18:28:37.000000000 +0100 +++ new/langtools-0a2dce555d35/ASSEMBLY_EXCEPTION 2018-02-06 19:20:59.000000000 +0100 @@ -1,27 +1,27 @@ OPENJDK ASSEMBLY EXCEPTION -The OpenJDK source code made available by Sun at openjdk.java.net and -openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the -GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 +The OpenJDK source code made available by Oracle America, Inc. (Oracle) at +openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU +General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 only ("GPL2"), with the following clarification and special exception. Linking this OpenJDK Code statically or dynamically with other code is making a combined work based on this library. Thus, the terms and conditions of GPL2 cover the whole combination. - As a special exception, Sun gives you permission to link this - OpenJDK Code with certain code licensed by Sun as indicated at + As a special exception, Oracle gives you permission to link this + OpenJDK Code with certain code licensed by Oracle as indicated at http://openjdk.java.net/legal/exception-modules-2007-05-08.html ("Designated Exception Modules") to produce an executable, regardless of the license terms of the Designated Exception Modules, and to copy and distribute the resulting executable under GPL2, provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Sun. + governed by the licenses under which they were offered by Oracle. -As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to -build an executable that includes those portions of necessary code that Sun -could not provide under GPL2 (or that Sun has provided under GPL2 with the -Classpath exception). If you modify or add to the OpenJDK code, that new -GPL2 code may still be combined with Designated Exception Modules if the -new code is made subject to this exception by its copyright holder. +As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code +to build an executable that includes those portions of necessary code that +Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 +with the Classpath exception). If you modify or add to the OpenJDK code, +that new GPL2 code may still be combined with Designated Exception Modules +if the new code is made subject to this exception by its copyright holder. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-61a1c711f7ab/THIRD_PARTY_README new/langtools-0a2dce555d35/THIRD_PARTY_README --- old/langtools-61a1c711f7ab/THIRD_PARTY_README 2017-10-30 18:28:37.000000000 +0100 +++ new/langtools-0a2dce555d35/THIRD_PARTY_README 2018-02-06 19:20:59.000000000 +0100 @@ -7,7 +7,7 @@ --- begin of LICENSE --- -Copyright (c) 2000-2011 France Télécom +Copyright (c) 2000-2011 France T??l??com All rights reserved. Redistribution and use in source and binary forms, with or without @@ -849,7 +849,7 @@ --- begin of LICENSE --- Copyright notice -Copyright © 2011 Ecma International +Copyright ?? 2011 Ecma International Ecma International Rue du Rhone 114 CH-1204 Geneva @@ -916,7 +916,7 @@ --- begin of LICENSE --- -Copyright © 2001,2003 Keith Packard +Copyright ?? 2001,2003 Keith Packard Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the @@ -2212,16 +2212,16 @@ Unicode Terms of Use For the general privacy policy governing access to this site, see the Unicode -Privacy Policy. For trademark usage, see the Unicode® Consortium Name and +Privacy Policy. For trademark usage, see the Unicode?? Consortium Name and Trademark Usage Policy. A. Unicode Copyright. - 1. Copyright © 1991-2013 Unicode, Inc. All rights reserved. + 1. Copyright ?? 1991-2013 Unicode, Inc. All rights reserved. 2. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative - works conforming to the Unicode® Standard, subject to Terms and + works conforming to the Unicode?? Standard, subject to Terms and Conditions herein. 3. Any person is hereby authorized, without fee, to view, use, reproduce, @@ -2287,14 +2287,14 @@ E.Trademarks & Logos. 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, - Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of + Inc. ???The Unicode Consortium??? and ???Unicode, Inc.??? are trade names of Unicode, Inc. Use of the information and materials found on this - website indicates your acknowledgement of Unicode, Inc.’s exclusive + website indicates your acknowledgement of Unicode, Inc.???s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names. - 2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark - Policy”) are incorporated herein by reference and you agree to abide by + 2. The Unicode Consortium Name and Trademark Usage Policy (???Trademark + Policy???) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. @@ -2317,12 +2317,12 @@ 2. Modification by Unicode. Unicode shall have the right to modify this Agreement at any time by posting it to this site. The user may not - assign any part of this Agreement without Unicode’s prior written + assign any part of this Agreement without Unicode???s prior written consent. 3. Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on - Unicode’s net income. + Unicode???s net income. 4. Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain @@ -2351,7 +2351,7 @@ COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the +Copyright ?? 1991-2012 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining a copy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-61a1c711f7ab/src/share/classes/com/sun/tools/javac/jvm/Gen.java new/langtools-0a2dce555d35/src/share/classes/com/sun/tools/javac/jvm/Gen.java --- old/langtools-61a1c711f7ab/src/share/classes/com/sun/tools/javac/jvm/Gen.java 2017-10-30 18:28:37.000000000 +0100 +++ new/langtools-0a2dce555d35/src/share/classes/com/sun/tools/javac/jvm/Gen.java 2018-02-06 19:20:59.000000000 +0100 @@ -27,6 +27,7 @@ import java.util.*; +import com.sun.tools.javac.tree.TreeInfo.PosKind; import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; import com.sun.tools.javac.util.List; @@ -1531,12 +1532,16 @@ catchallpc, 0); startseg = env.info.gaps.next().intValue(); } - code.statBegin(TreeInfo.finalizerPos(env.tree)); + code.statBegin(TreeInfo.finalizerPos(env.tree, PosKind.FIRST_STAT_POS)); code.markStatBegin(); Item excVar = makeTemp(syms.throwableType); excVar.store(); genFinalizer(env); + code.resolvePending(); + code.statBegin(TreeInfo.finalizerPos(env.tree, PosKind.END_POS)); + code.markStatBegin(); + excVar.load(); registerCatch(body.pos(), startseg, env.info.gaps.next().intValue(), @@ -1550,7 +1555,7 @@ code.resolve(env.info.cont); // Mark statement line number - code.statBegin(TreeInfo.finalizerPos(env.tree)); + code.statBegin(TreeInfo.finalizerPos(env.tree, PosKind.FIRST_STAT_POS)); code.markStatBegin(); // Save return address. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-61a1c711f7ab/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties new/langtools-0a2dce555d35/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties --- old/langtools-61a1c711f7ab/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties 2017-10-30 18:28:37.000000000 +0100 +++ new/langtools-0a2dce555d35/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties 2018-02-06 19:20:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -639,10 +639,10 @@ compiler.err.repeated.modifier=\u4FEE\u9970\u7B26\u91CD\u590D # 0: symbol, 1: set of modifier, 2: symbol -compiler.err.report.access={0}\u53EF\u4EE5\u5728{2}\u4E2D\u8BBF\u95EE{1} +compiler.err.report.access={0} \u5728 {2} \u4E2D\u662F {1} \u8BBF\u95EE\u63A7\u5236 # 0: symbol, 1: set of modifier, 2: symbol -compiler.misc.report.access={0}\u53EF\u4EE5\u5728{2}\u4E2D\u8BBF\u95EE{1} +compiler.misc.report.access={0} \u5728 {2} \u4E2D\u662F {1} \u8BBF\u95EE\u63A7\u5236 compiler.err.ret.outside.meth=\u8FD4\u56DE\u5916\u90E8\u65B9\u6CD5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-61a1c711f7ab/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java new/langtools-0a2dce555d35/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java --- old/langtools-61a1c711f7ab/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java 2017-10-30 18:28:37.000000000 +0100 +++ new/langtools-0a2dce555d35/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java 2018-02-06 19:20:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,6 +35,7 @@ import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.tree.JCTree.JCPolyExpression.*; import com.sun.tools.javac.util.*; + import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.TypeTag.BOT; @@ -611,13 +612,21 @@ }; } + public enum PosKind { + START_POS() { int toPos(JCTree tree) { return TreeInfo.getStartPos(tree); } }, + FIRST_STAT_POS() { int toPos(JCTree tree) { return firstStatPos(tree); } }, + END_POS() { int toPos(JCTree tree) { return endPos(tree); } }; + + abstract int toPos(JCTree tree); + } + /** The position of the finalizer of given try/synchronized statement. */ - public static int finalizerPos(JCTree tree) { + public static int finalizerPos(JCTree tree, PosKind posKind) { if (tree.hasTag(TRY)) { JCTry t = (JCTry) tree; Assert.checkNonNull(t.finalizer); - return firstStatPos(t.finalizer); + return posKind.toPos(t.finalizer); } else if (tree.hasTag(SYNCHRONIZED)) { return endPos(((JCSynchronized) tree).body); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-61a1c711f7ab/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java new/langtools-0a2dce555d35/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java --- old/langtools-61a1c711f7ab/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java 2017-10-30 18:28:37.000000000 +0100 +++ new/langtools-0a2dce555d35/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java 2018-02-06 19:20:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,6 +64,7 @@ {9, 21}, //System.out.println("finally"); {10, 29}, {9, 32}, //System.out.println("finally"); + {10, 41}, //} {11, 43}, }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-61a1c711f7ab/test/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java new/langtools-0a2dce555d35/test/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java --- old/langtools-61a1c711f7ab/test/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java 1970-01-01 01:00:00.000000000 +0100 +++ new/langtools-0a2dce555d35/test/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java 2018-02-06 19:20:59.000000000 +0100 @@ -0,0 +1,170 @@ +/* + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8180141 + * @summary Missing entry in LineNumberTable for break statement that jumps out of try-finally + * @compile -g MissingLNTEntryForFinalizerTest.java + * @run main MissingLNTEntryForFinalizerTest + */ + +import java.io.File; +import java.net.URI; + +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; + +import com.sun.tools.classfile.*; +import com.sun.tools.javac.comp.Attr; +import com.sun.tools.javac.comp.AttrContext; +import com.sun.tools.javac.comp.Env; +import com.sun.tools.javac.file.JavacFileManager; +import com.sun.tools.javac.main.JavaCompiler; +import com.sun.tools.javac.tree.JCTree; +import com.sun.tools.javac.tree.JCTree.*; +import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.List; + +import static com.sun.tools.javac.util.List.of; +import static com.sun.tools.javac.tree.JCTree.Tag.*; + +public class MissingLNTEntryForFinalizerTest { + protected ReusableJavaCompiler tool; + Context context; + + MissingLNTEntryForFinalizerTest() { + context = new Context(); + JavacFileManager.preRegister(context); + MyAttr.preRegister(context); + tool = new ReusableJavaCompiler(context); + } + + public static void main(String... args) throws Throwable { + new MissingLNTEntryForFinalizerTest().test(); + } + + void test() throws Throwable { + JavaSource source = new JavaSource("1"); + tool.clear(); + List<JavaFileObject> inputs = of(source); + try { + tool.compile(inputs); + } catch (Throwable ex) { + throw new AssertionError(ex); + } + File testClasses = new File("."); + File file = new File(testClasses, "Test1.class"); + ClassFile classFile = ClassFile.read(file); + for (Method m : classFile.methods) { + if (classFile.constant_pool.getUTF8Value(m.name_index).equals("foo")) { + Code_attribute code = (Code_attribute)m.attributes.get(Attribute.Code); + LineNumberTable_attribute lnt = (LineNumberTable_attribute)code.attributes.get(Attribute.LineNumberTable); + checkLNT(lnt, MyAttr.lineNumber); + } + } + } + + void checkLNT(LineNumberTable_attribute lnt, int lineToCheckFor) { + for (LineNumberTable_attribute.Entry e: lnt.line_number_table) { + if (e.line_number == lineToCheckFor) { + return; + } + } + throw new AssertionError("seek line number not found in the LNT for method foo()"); + } + + class JavaSource extends SimpleJavaFileObject { + String id; + String template = + "import java.util.*;\n" + + "class Test#Id {\n" + + " void foo() {\n" + + " List<String> l = null;\n" + + " String first = null;\n" + + " try {\n" + + " first = l.get(0);\n" + + " } finally {\n" + + " if (first != null) {\n" + + " System.out.println(\"finalizer\");\n" + + " }\n" + + " }\n" + + " }\n" + + "}"; + + JavaSource(String id) { + super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); + this.id = id; + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return template.replace("#Id", id); + } + } + + /* this class has been set up to do not depend on a fixed line number, this Attr subclass will + * look for 'break' or 'continue' statements in order to find the actual line number they occupy. + * This way the test can find if that line number appears in the LNT generated for a given class. + */ + static class MyAttr extends Attr { + static int lineNumber; + + static void preRegister(Context context) { + context.put(attrKey, (com.sun.tools.javac.util.Context.Factory<Attr>) c -> new MyAttr(c)); + } + + MyAttr(Context context) { + super(context); + } + + @Override + public com.sun.tools.javac.code.Type attribStat(JCTree tree, Env<AttrContext> env) { + com.sun.tools.javac.code.Type result = super.attribStat(tree, env); + if (tree.hasTag(TRY)) { + JCTry tryTree = (JCTry)tree; + lineNumber = env.toplevel.lineMap.getLineNumber(tryTree.finalizer.endpos); + } + return result; + } + } + + static class ReusableJavaCompiler extends JavaCompiler { + ReusableJavaCompiler(Context context) { + super(context); + } + + protected void checkReusable() { + // do nothing + } + + @Override + public void close() { + //do nothing + } + + void clear() { + //do nothing + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-61a1c711f7ab/test/tools/javac/linenumbers/FinallyLineNumberTest.java new/langtools-0a2dce555d35/test/tools/javac/linenumbers/FinallyLineNumberTest.java --- old/langtools-61a1c711f7ab/test/tools/javac/linenumbers/FinallyLineNumberTest.java 2017-10-30 18:28:37.000000000 +0100 +++ new/langtools-0a2dce555d35/test/tools/javac/linenumbers/FinallyLineNumberTest.java 2018-02-06 19:20:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,7 +36,6 @@ import com.sun.tools.classfile.LineNumberTable_attribute; import com.sun.tools.classfile.LineNumberTable_attribute.Entry; -import java.io.File; import java.io.IOException; public class FinallyLineNumberTest { @@ -46,13 +45,13 @@ if (lines == null) { throw new Exception("finally line number table could not be loaded"); } - if (lines.length != 4) { + if (lines.length != 5) { // Help debug System.err.println("LineTable error, got lines:"); for (Entry e : lines) { System.err.println(e.line_number); } - throw new Exception("finally line number table incorrect: length=" + lines.length + " expected length=4"); + throw new Exception("finally line number table incorrect: length=" + lines.length + " expected length=5"); } // return null line, for the load null operation @@ -71,11 +70,17 @@ throw new Exception("finally line number table incorrect: got=" + current + " expected=" + first); } - // finally line, for when exception is thrown + // for when exception is thrown current = lines[3].line_number; if (current != first + 2) { throw new Exception("finally line number table incorrect: got=" + current + " expected=" + (first + 2)); } + + // the '}' closing the finally block + current = lines[4].line_number; + if (current != first + 3) { + throw new Exception("finally line number table incorrect: got=" + current + " expected=" + (first + 3)); + } } static Entry[] findEntries() throws IOException, ConstantPoolException { ++++++ nashorn.tar.xz ++++++ ++++ 1732 lines of diff (skipped) ++++++ openjdk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-eb577ed6ec93/.hgtags new/icedtea8-forest-644bdc77dd18/.hgtags --- old/icedtea8-forest-eb577ed6ec93/.hgtags 2017-10-30 18:28:35.000000000 +0100 +++ new/icedtea8-forest-644bdc77dd18/.hgtags 2018-02-14 05:23:39.000000000 +0100 @@ -691,6 +691,8 @@ 14388b14d4847c3eacce677eae37980e6fa545cd jdk8u112-b16 cc0c4b0b1c3ee397524f001a8969d361feb288dd icedtea-3.3.0pre01 1a7a5fe22a028e438a724d909d27da2ea96c6d86 jdk8u112-b31 +911c506096560e49442a4c8f598f7f43c2339720 jdk8u112-b32 +8e27761a403ff4b237219cfb22731e127a1d1744 jdk8u112-b33 58ac6fce1d10c1fba366ad58950a6a54b27a5bcb jdk8u121-b00 a2c5309f998f8aa207a6e381464263e9a7dd50e0 jdk8u121-b01 a2aa2e98905609a0b5809a38163239a7c97d31c1 jdk8u121-b02 @@ -708,6 +710,12 @@ d5760f7cce541f5958d5f1ad7aa45eb6b6da7124 icedtea-3.3.0 f890a36627cca086e34c7f06abe5d5f0ce5888d6 icedtea-3.4.0pre01 f2b5b6ab1f5544b92074adb5bb80cc031649d0e7 jdk8u121-b13 +7cc899fc144561be76c4286b3e9ee06b1facef32 jdk8u121-b31 +6838c13eb094eeb3119decfd952dedc2f51427ed jdk8u121-b32 +77581d764b55726370f40552b32d8bdc3a12f285 jdk8u121-b33 +31e1a5ba68cd0f00585c4adea6b405d8bc166361 jdk8u121-b34 +041abd76a482e3df5dffe1b303853dae1fa52c7a jdk8u121-b35 +6b5494fc6df0c6608fe869275b188c41fe47cfdb jdk8u121-b36 986503d59e09ac8f61bac904b0875abbe869492f jdk8u131-b00 8d1b3d2482437ec6a0bfae10e1475fd80916ab7d jdk8u131-b01 66811607997db903aae54676f43974c7f918da10 jdk8u131-b02 @@ -722,6 +730,10 @@ ed5ee0ac711175311b0ccba4274032f8a7b7660c icedtea-3.4.0 3e39851fea09d3d2f1ff4b869c7d7db12a11e278 icedtea-3.5.0pre01 94b1198760284f6b53daa4c3361261a0a5207150 jdk8u131-b11 +26016f048003d216cdf83e1b0318b6fc988a4ca8 jdk8u131-b31 +cc52a119d110cc633dce64629d4d25b3e1cc3b67 jdk8u131-b32 +ff0e5fb867ed031ee8d629e6ddc637f92f03dc17 jdk8u131-b33 +e0c72f33efb916a8eafbca328f3f848b87383cc4 jdk8u131-b34 756ee32cd629989dfe63c5e11dfcf2d3598543f0 jdk8u141-b00 b174b1474d36381dadb65391ba67f8e44d14e2f6 jdk8u141-b01 3036128430bcd058d81fe4b5bf18dc7beabd6449 jdk8u141-b02 @@ -739,15 +751,24 @@ 68a5871a5dd3ca652cf4623b686aacbb1da0a93b jdk8u141-b14 ee1282876d8a593d8a0edd813f77b4b9552821b8 icedtea-3.5.0 48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15 +123326194347f1778bbd124594bcddba8181d23b jdk8u141-b31 +f1021394489da9a3621ba92fd427572abb32413f jdk8u141-b32 9a342a4d909784cccb664f2293c8cb1463c3ac41 jdk8u144-b00 80ab5dd98579910a24f13cae0a4c7e4092ed3557 icedtea-3.5.1 ee1282876d8a593d8a0edd813f77b4b9552821b8 icedtea-3.6.0pre00 80ab5dd98579910a24f13cae0a4c7e4092ed3557 icedtea-3.6.0pre01 63060ee6ba74f271059e59348c865c5991d856d3 icedtea-3.6.0pre02 57a5aae91b8bdccc4e1910cf373f13598429f03e jdk8u144-b01 +21446f3c909e3ed750def8b4dacbec6074606ed3 jdk8u144-b31 +b032efb8a72675cfded271b99ad84602189f7849 jdk8u144-b32 +9a2e03172d83689006df0a86d89cc84cf82b7b12 jdk8u144-b33 +fe4076d1d773f63ab4ff9cc9cfc605c174a7b156 jdk8u144-b34 +123326194347f1778bbd124594bcddba8181d23b jdk8u141-b31 +f1021394489da9a3621ba92fd427572abb32413f jdk8u141-b32 b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00 0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01 9408ef2c7b205185aa5f9079fc44424328c64156 jdk8u151-b02 +00790ebdff1c5bc4cda000073b24f94dcc96e14f jdk8u161-b00 66a82078ad5463ff048ec7b21405da3b5f62214a jdk8u151-b03 6e00c7da6a32c0f750ccfbe4c71204eeb6cccc14 jdk8u151-b04 6d4ab2046f26035e500924bffb49934d66aa64e3 jdk8u151-b05 @@ -757,3 +778,63 @@ dd863a7bde3f0a335b99c9205af84a404fc55488 jdk8u151-b09 af89399e4d1190c42e23b95da79800da51b40808 jdk8u151-b10 ace131d990fdb75a6616f18265b2c4ecca2e3f5d jdk8u151-b11 +eb577ed6ec931d15540c6a71192a6a55f8366569 icedtea-3.6.0 +27cf3b1673624b3b9e246e526ba7848fa5f98400 jdk8u151-b12 +b94f31b809debc683b996146ac20acbb269381f9 jdk8u122-b00 +73494e6ff8e5a5a66cb87445d6c5a0a8acab3409 jdk8u122-b01 +89062b8ff53bfc62689c52373f5564369cd61609 jdk8u122-b02 +4cf57a6813323a1c3336bef63ca7c16d52146637 jdk8u122-b03 +4cf57a6813323a1c3336bef63ca7c16d52146637 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +b6e27dc2775764b59755eb054c66fbec9b2684b7 jdk8u122-b03 +6dd80b19838ded52371aa280cb8a68ad80aed22d jdk8u122-b04 +1e501e6d58a962a1ef5dd933dc4cce56a5358a98 jdk8u132-b00 +d15b51f1149bd1b7e87f4ec6a1bc5678c15275ef jdk8u152-b00 +b6446826930c8577c7a90009dd472b7eb813e495 jdk8u152-b01 +d7045c4d4eab5eb23ed9e43a351ff1a497ba7a7e jdk8u152-b02 +0414b34a471e1c3d277a5b0e583c6bfd9708305c jdk8u152-b03 +ea8d7d26cccae878ffed38eaa3f3c49d74c891fd jdk8u152-b04 +c23b7c1c24bf06ffa1bd52f19d541a56cdb1b350 jdk8u152-b05 +ff59566476c79e8143bf18eefb79196cc3a12994 jdk8u152-b06 +c0a2f84796bc8a55bb686069114de60a7cc2c875 jdk8u152-b07 +8f1aee9f3d074e074b74fdd4c63d21c554295443 jdk8u152-b08 +88df79df1243571bbce3a8d4935ff7f25b9ade78 jdk8u152-b09 +336862c1e889840a37fe3b07eae2cd328382782d jdk8u152-b10 +075ea12bcfd50b6567f8fce95bfaec952dcdbda7 jdk8u152-b11 +b6d513f3cde1d8a7b81f769926e3d55b514696b2 jdk8u152-b12 +ec86194825dd0c2fc3d6ee88b287650e1c8e24c9 jdk8u152-b13 +c425fe56b8fb34e21a798be796305f51d648f11b jdk8u152-b14 +d680e12deacbc531fe647d356540384efe625223 jdk8u152-b15 +9a7fbbe2d7edc786d1be470060f9a43e2a675eb4 icedtea-3.7.0pre01 +7a25d12cd94fa7a881f064dcb35f0e88ed073c45 jdk8u152-b16 +b94f31b809debc683b996146ac20acbb269381f9 jdk8u122-b00 +73494e6ff8e5a5a66cb87445d6c5a0a8acab3409 jdk8u122-b01 +89062b8ff53bfc62689c52373f5564369cd61609 jdk8u122-b02 +4cf57a6813323a1c3336bef63ca7c16d52146637 jdk8u122-b03 +4cf57a6813323a1c3336bef63ca7c16d52146637 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +b6e27dc2775764b59755eb054c66fbec9b2684b7 jdk8u122-b03 +6dd80b19838ded52371aa280cb8a68ad80aed22d jdk8u122-b04 +1e501e6d58a962a1ef5dd933dc4cce56a5358a98 jdk8u132-b00 +d15b51f1149bd1b7e87f4ec6a1bc5678c15275ef jdk8u152-b00 +b6446826930c8577c7a90009dd472b7eb813e495 jdk8u152-b01 +d7045c4d4eab5eb23ed9e43a351ff1a497ba7a7e jdk8u152-b02 +0414b34a471e1c3d277a5b0e583c6bfd9708305c jdk8u152-b03 +ea8d7d26cccae878ffed38eaa3f3c49d74c891fd jdk8u152-b04 +c23b7c1c24bf06ffa1bd52f19d541a56cdb1b350 jdk8u152-b05 +ff59566476c79e8143bf18eefb79196cc3a12994 jdk8u152-b06 +c0a2f84796bc8a55bb686069114de60a7cc2c875 jdk8u152-b07 +00790ebdff1c5bc4cda000073b24f94dcc96e14f jdk8u161-b00 +6e53d489c0a58cb548a65396ae8383a9f2e298d2 jdk8u161-b01 +d66f57333c7fcc735f87eb0903ffdc0aaf899b32 jdk8u161-b02 +33f1ededc6f79f4c1d476d63f650d020d1a68d20 jdk8u161-b03 +7b4e91fb47c3ea83ca920a0e0701a5b793674d7c jdk8u161-b04 +3024b7c1ddb2be1a3c5cfaf454226999615967a1 jdk8u161-b05 +25d390a136a346a949156772d0c0c986f815b227 jdk8u161-b06 +430b63960a8164704c76866584db14d64074d87f jdk8u161-b07 +670b9c20ae50ab3fcffcb9ac0867e3ac59714303 jdk8u161-b08 +ff7dd95280fbaf4aa23b20f50a920dbdef561d12 jdk8u161-b09 +fff44bb7f1db7d141b0039064b86340dac338d41 jdk8u161-b10 +89f84abd0219b7576fe65abbc51ac0fbcf0d5284 jdk8u161-b11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-eb577ed6ec93/ASSEMBLY_EXCEPTION new/icedtea8-forest-644bdc77dd18/ASSEMBLY_EXCEPTION --- old/icedtea8-forest-eb577ed6ec93/ASSEMBLY_EXCEPTION 2017-10-30 18:28:35.000000000 +0100 +++ new/icedtea8-forest-644bdc77dd18/ASSEMBLY_EXCEPTION 2018-02-14 05:23:39.000000000 +0100 @@ -1,27 +1,27 @@ OPENJDK ASSEMBLY EXCEPTION -The OpenJDK source code made available by Sun at openjdk.java.net and -openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the -GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 +The OpenJDK source code made available by Oracle America, Inc. (Oracle) at +openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU +General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 only ("GPL2"), with the following clarification and special exception. Linking this OpenJDK Code statically or dynamically with other code is making a combined work based on this library. Thus, the terms and conditions of GPL2 cover the whole combination. - As a special exception, Sun gives you permission to link this - OpenJDK Code with certain code licensed by Sun as indicated at + As a special exception, Oracle gives you permission to link this + OpenJDK Code with certain code licensed by Oracle as indicated at http://openjdk.java.net/legal/exception-modules-2007-05-08.html ("Designated Exception Modules") to produce an executable, regardless of the license terms of the Designated Exception Modules, and to copy and distribute the resulting executable under GPL2, provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Sun. + governed by the licenses under which they were offered by Oracle. -As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to -build an executable that includes those portions of necessary code that Sun -could not provide under GPL2 (or that Sun has provided under GPL2 with the -Classpath exception). If you modify or add to the OpenJDK code, that new -GPL2 code may still be combined with Designated Exception Modules if the -new code is made subject to this exception by its copyright holder. +As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code +to build an executable that includes those portions of necessary code that +Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 +with the Classpath exception). If you modify or add to the OpenJDK code, +that new GPL2 code may still be combined with Designated Exception Modules +if the new code is made subject to this exception by its copyright holder. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-eb577ed6ec93/THIRD_PARTY_README new/icedtea8-forest-644bdc77dd18/THIRD_PARTY_README --- old/icedtea8-forest-eb577ed6ec93/THIRD_PARTY_README 2017-10-30 18:28:35.000000000 +0100 +++ new/icedtea8-forest-644bdc77dd18/THIRD_PARTY_README 2018-02-14 05:23:39.000000000 +0100 @@ -7,7 +7,7 @@ --- begin of LICENSE --- -Copyright (c) 2000-2011 France Télécom +Copyright (c) 2000-2011 France T??l??com All rights reserved. Redistribution and use in source and binary forms, with or without @@ -849,7 +849,7 @@ --- begin of LICENSE --- Copyright notice -Copyright © 2011 Ecma International +Copyright ?? 2011 Ecma International Ecma International Rue du Rhone 114 CH-1204 Geneva @@ -916,7 +916,7 @@ --- begin of LICENSE --- -Copyright © 2001,2003 Keith Packard +Copyright ?? 2001,2003 Keith Packard Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the @@ -2212,16 +2212,16 @@ Unicode Terms of Use For the general privacy policy governing access to this site, see the Unicode -Privacy Policy. For trademark usage, see the Unicode® Consortium Name and +Privacy Policy. For trademark usage, see the Unicode?? Consortium Name and Trademark Usage Policy. A. Unicode Copyright. - 1. Copyright © 1991-2013 Unicode, Inc. All rights reserved. + 1. Copyright ?? 1991-2013 Unicode, Inc. All rights reserved. 2. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative - works conforming to the Unicode® Standard, subject to Terms and + works conforming to the Unicode?? Standard, subject to Terms and Conditions herein. 3. Any person is hereby authorized, without fee, to view, use, reproduce, @@ -2287,14 +2287,14 @@ E.Trademarks & Logos. 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, - Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of + Inc. ???The Unicode Consortium??? and ???Unicode, Inc.??? are trade names of Unicode, Inc. Use of the information and materials found on this - website indicates your acknowledgement of Unicode, Inc.’s exclusive + website indicates your acknowledgement of Unicode, Inc.???s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names. - 2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark - Policy”) are incorporated herein by reference and you agree to abide by + 2. The Unicode Consortium Name and Trademark Usage Policy (???Trademark + Policy???) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. @@ -2317,12 +2317,12 @@ 2. Modification by Unicode. Unicode shall have the right to modify this Agreement at any time by posting it to this site. The user may not - assign any part of this Agreement without Unicode’s prior written + assign any part of this Agreement without Unicode???s prior written consent. 3. Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on - Unicode’s net income. + Unicode???s net income. 4. Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain @@ -2351,7 +2351,7 @@ COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the +Copyright ?? 1991-2012 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining a copy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-eb577ed6ec93/common/autoconf/generated-configure.sh new/icedtea8-forest-644bdc77dd18/common/autoconf/generated-configure.sh --- old/icedtea8-forest-eb577ed6ec93/common/autoconf/generated-configure.sh 2017-10-30 18:28:35.000000000 +0100 +++ new/icedtea8-forest-644bdc77dd18/common/autoconf/generated-configure.sh 2018-02-14 05:23:39.000000000 +0100 @@ -3999,7 +3999,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1500922661 +DATE_WHEN_GENERATED=1518582174 ############################################################################### # @@ -20101,7 +20101,6 @@ fi fi - COMPILER=$CC COMPILER_NAME=$COMPILER_NAME @@ -20170,8 +20169,7 @@ # First line typically looks something like: # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \ - $SED -e 's/^.* $[1-9]\.[0-9.]*$[^0-9.].*$/\1/'` + COMPILER_VERSION=`$COMPILER -dumpversion` COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^$.*$ [1-9][0-9.]*/\1/p"` fi # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker) @@ -21283,7 +21281,6 @@ fi fi - COMPILER=$CXX COMPILER_NAME=$COMPILER_NAME @@ -21352,8 +21349,7 @@ # First line typically looks something like: # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \ - $SED -e 's/^.* $[1-9]\.[0-9.]*$[^0-9.].*$/\1/'` + COMPILER_VERSION=`$COMPILER -dumpversion` COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^$.*$ [1-9][0-9.]*/\1/p"` fi # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-eb577ed6ec93/common/autoconf/toolchain.m4 new/icedtea8-forest-644bdc77dd18/common/autoconf/toolchain.m4 --- old/icedtea8-forest-eb577ed6ec93/common/autoconf/toolchain.m4 2017-10-30 18:28:35.000000000 +0100 +++ new/icedtea8-forest-644bdc77dd18/common/autoconf/toolchain.m4 2018-02-14 05:23:39.000000000 +0100 @@ -138,8 +138,7 @@ # First line typically looks something like: # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \ - $SED -e 's/^.* $@<:@1-9@:>@\.@<:@0-9.@:>@*$@<:@^0-9.@:>@.*$/\1/'` + COMPILER_VERSION=`$COMPILER -dumpversion` COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^$.*$ @<:@1-9@:>@@<:@0-9.@:>@*/\1/p"` fi # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker) @@ -222,7 +221,6 @@ AC_MSG_ERROR([$TEST_COMPILER is a symbolic link to ccache. This is not supported.]) fi fi - TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME]) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea8-forest-eb577ed6ec93/make/common/NativeCompilation.gmk new/icedtea8-forest-644bdc77dd18/make/common/NativeCompilation.gmk --- old/icedtea8-forest-eb577ed6ec93/make/common/NativeCompilation.gmk 2017-10-30 18:28:35.000000000 +0100 +++ new/icedtea8-forest-644bdc77dd18/make/common/NativeCompilation.gmk 2018-02-14 05:23:39.000000000 +0100 @@ -297,17 +297,21 @@ $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS)) endif - # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS. - $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) + # Pickup extra OPENJDK_TARGET_OS_API, OPENJDK_TARGET_OS, and/or OPENJDK_TARGET_OS plus + # OPENJDK_TARGET_CPU pair dependent variables for CFLAGS. + $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) \ + $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)) ifneq ($(DEBUG_LEVEL),release) # Pickup extra debug dependent variables for CFLAGS $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug) + $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_debug) else $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release) + $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_release) endif # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.

1 0

commit plasma5-desktop for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '18

02 Mar '18

Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2018-03-02 21:09:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-desktop" Fri Mar 2 21:09:39 2018 rev:79 rq:581718 version:5.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2018-02-28 19:59:01.368016195 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2018-03-02 21:09:41.205302257 +0100 @@ -1,0 +2,6 @@ +Thu Mar 1 14:03:24 UTC 2018 - fabian(a)ritter-vogt.de + +- Backport upstream commit to move the toolbox away from the desktop icons: + * 0001-Place-toolbox-in-the-top-right-corner-of-the-screen.patch + +------------------------------------------------------------------- New: ---- 0001-Place-toolbox-in-the-top-right-corner-of-the-screen.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.QyA5co/_old 2018-03-02 21:09:42.137268743 +0100 +++ /var/tmp/diff_new_pack.QyA5co/_new 2018-03-02 21:09:42.141268599 +0100 @@ -35,6 +35,7 @@ Patch1: 0001-Use-themed-user-face-icon-in-kickoff.patch # PATCHES 100-200 and above are from upstream 5.12 branch # PATCHES 201-300 and above are from upstream master/5.13 branch +Patch201: 0001-Place-toolbox-in-the-top-right-corner-of-the-screen.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -177,7 +178,7 @@ %lang_package %prep %setup -q -n plasma-desktop-%{version} -%patch1 -p1 +%autopatch -p1 # Workaround for boo#1038368 sed -i"" "s/Name=Desktop/Name=Desktop Containment/g" containments/desktop/package/metadata.desktop ++++++ 0001-Place-toolbox-in-the-top-right-corner-of-the-screen.patch ++++++ >From 295cba58c8f0ccdf414df1e32ac31c4840835f53 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik <kde(a)privat.broulik.de> Date: Fri, 23 Feb 2018 11:37:02 +0100 Subject: [PATCH] Place toolbox in the top right corner of the screen This moves it out of the way of desktop icons and is also what Plasma 4 did. The code is adjusted to mirror the position for right-to-left languages. BUG: 390038 FIXED-IN: 5.13.0 Differential Revision: https://phabricator.kde.org/D10563 --- containments/desktop/package/contents/config/main.xml | 2 +- toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/containments/desktop/package/contents/config/main.xml b/containments/desktop/package/contents/config/main.xml index 6830fb02..8356d283 100644 --- a/containments/desktop/package/contents/config/main.xml +++ b/containments/desktop/package/contents/config/main.xml @@ -20,7 +20,7 @@ </entry> <entry name="ToolBoxButtonState" type="String"> <label>Position state of the toolbox button.</label> - <default>topleft</default> + <default></default> </entry> <entry name="ToolBoxButtonX" type="int"> <label>X coordinate of the toolbox.</label> diff --git a/toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml b/toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml index d7c638d4..55abcd7a 100644 --- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml +++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml @@ -140,6 +140,16 @@ Item { } function placeToolBox(ts) { + // if nothing has been setup yet, determin default position based on layout direction + if (!ts) { + if (Qt.application.layoutDirection === Qt.RightToLeft) { + placeToolBox("topleft"); + } else { + placeToolBox("topright"); + } + return; + } + var tx = Plasmoid.configuration.ToolBoxButtonX var ty = Plasmoid.configuration.ToolBoxButtonY var pos; -- 2.16.1

1 0

commit python-xattr for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '18

02 Mar '18

Hello community, here is the log from the commit of package python-xattr for openSUSE:Factory checked in at 2018-03-02 21:09:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-xattr (Old) and /work/SRC/openSUSE:Factory/.python-xattr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-xattr" Fri Mar 2 21:09:31 2018 rev:16 rq:581715 version:0.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-xattr/python-xattr.changes 2017-08-30 16:24:38.717318416 +0200 +++ /work/SRC/openSUSE:Factory/.python-xattr.new/python-xattr.changes 2018-03-02 21:09:33.517578718 +0100 @@ -1,0 +2,5 @@ +Thu Feb 22 13:22:46 UTC 2018 - rjschwei(a)suse.com + +- Relax version constraint for cffi requirement + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-xattr.spec ++++++ --- /var/tmp/diff_new_pack.411Xlj/_old 2018-03-02 21:09:34.753534271 +0100 +++ /var/tmp/diff_new_pack.411Xlj/_new 2018-03-02 21:09:34.757534127 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-xattr # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros -%requires_eq python-cffi +Requires: python-cffi >= 1.11 Requires(post): update-alternatives Requires(postun): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build

1 0

commit libdbusmenu for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '18

02 Mar '18

Hello community, here is the log from the commit of package libdbusmenu for openSUSE:Factory checked in at 2018-03-02 21:09:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdbusmenu (Old) and /work/SRC/openSUSE:Factory/.libdbusmenu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdbusmenu" Fri Mar 2 21:09:19 2018 rev:6 rq:581672 version:16.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libdbusmenu/libdbusmenu.changes 2016-09-09 10:20:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdbusmenu.new/libdbusmenu.changes 2018-03-02 21:09:22.133988087 +0100 @@ -1,0 +2,5 @@ +Wed Feb 28 16:34:14 UTC 2018 - dimstar(a)opensuse.org + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbusmenu.spec ++++++ --- /var/tmp/diff_new_pack.YHM2k8/_old 2018-03-02 21:09:23.201949681 +0100 +++ /var/tmp/diff_new_pack.YHM2k8/_new 2018-03-02 21:09:23.205949538 +0100 @@ -1,7 +1,7 @@ # # spec file for package libdbusmenu # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,9 +24,9 @@ Version: 16.04.0 Release: 0 Summary: Small library that passes a menu structure across DBus -License: GPL-3.0 and (LGPL-2.1 or LGPL-3.0) +License: GPL-3.0-only AND (LGPL-2.1-only OR LGPL-3.0-only) Group: System/Libraries -Url: https://launchpad.net/dbusmenu +URL: https://launchpad.net/dbusmenu Source: https://launchpad.net/libdbusmenu/16.04/%{version}/+download/%{name}-%{vers… BuildRequires: autoconf BuildRequires: automake @@ -214,24 +214,17 @@ %{buildroot}%{_docdir}/%{name}-glib-devel/examples/ %post glib%{soname_glib} -p /sbin/ldconfig - %postun glib%{soname_glib} -p /sbin/ldconfig - %post gtk%{soname_gtk2} -p /sbin/ldconfig - %postun gtk%{soname_gtk2} -p /sbin/ldconfig - %post gtk3-%{soname_gtk3} -p /sbin/ldconfig - %postun gtk3-%{soname_gtk3} -p /sbin/ldconfig - %post jsonloader%{soname_jsonloader} -p /sbin/ldconfig - %postun jsonloader%{soname_jsonloader} -p /sbin/ldconfig %files tools -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %{_libexecdir}/dbusmenu-bench %{_libexecdir}/dbusmenu-dumper %{_libexecdir}/dbusmenu-testapp @@ -242,18 +235,18 @@ %doc %{_docdir}/%{name}-tools/README.dbusmenu-bench %files glib%{soname_glib} -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %{_libdir}/libdbusmenu-glib.so.%{soname_glib}* %files -n typelib-1_0-Dbusmenu-0_4 -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %{_libdir}/girepository-1.0/Dbusmenu-0.4.typelib %files glib-devel -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %dir %{_includedir}/libdbusmenu-glib-0.4/ %dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/ %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/client.h @@ -273,23 +266,23 @@ %doc %{_docdir}/%{name}-glib-devel/examples/glib-server-nomenu.c %files glib-doc -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %doc %{_datadir}/gtk-doc/html/libdbusmenu-glib/ %files gtk%{soname_gtk2} -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %{_libdir}/libdbusmenu-gtk.so.%{soname_gtk2}* %files -n typelib-1_0-DbusmenuGtk-0_4 -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %{_libdir}/girepository-1.0/DbusmenuGtk-0.4.typelib %files gtk-devel -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %dir %{_includedir}/libdbusmenu-gtk-0.4/ %dir %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/ %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/client.h @@ -304,18 +297,18 @@ %{_datadir}/vala/vapi/DbusmenuGtk-0.4.vapi %files gtk3-%{soname_gtk3} -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %{_libdir}/libdbusmenu-gtk3.so.%{soname_gtk3}* %files -n typelib-1_0-DbusmenuGtk3-0_4 -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %{_libdir}/girepository-1.0/DbusmenuGtk3-0.4.typelib %files gtk3-devel -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %dir %{_includedir}/libdbusmenu-gtk3-0.4/ %dir %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/ %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/client.h @@ -330,18 +323,18 @@ %{_datadir}/vala/vapi/DbusmenuGtk3-0.4.vapi %files gtk-doc -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %doc %{_datadir}/gtk-doc/html/libdbusmenu-gtk/ %files jsonloader%{soname_jsonloader} -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %{_libdir}/libdbusmenu-jsonloader.so.%{soname_jsonloader}* %files jsonloader-devel -%defattr(-,root,root) -%doc COPYING* NEWS +%license COPYING* +%doc NEWS %dir %{_includedir}/libdbusmenu-glib-0.4/ %dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/ %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/json-loader.h

1 0

commit gstreamer-plugins-base for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '18

02 Mar '18

Hello community, here is the log from the commit of package gstreamer-plugins-base for openSUSE:Factory checked in at 2018-03-02 21:09:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-base (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-plugins-base" Fri Mar 2 21:09:13 2018 rev:49 rq:581659 version:1.12.4 Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-plugins-base/gstreamer-plugins-base.changes 2018-01-16 09:41:28.528202980 +0100 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-base.new/gstreamer-plugins-base.changes 2018-03-02 21:09:15.310233478 +0100 @@ -1,0 +2,6 @@ +Wed Feb 28 16:31:40 UTC 2018 - dimstar(a)opensuse.org + +- Modernize spec-file by calling spec-cleaner. +- Drop filesystem PreRequires: this is simply nonsense. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-plugins-base.spec ++++++ --- /var/tmp/diff_new_pack.X1drDg/_old 2018-03-02 21:09:16.730182415 +0100 +++ /var/tmp/diff_new_pack.X1drDg/_new 2018-03-02 21:09:16.742181984 +0100 @@ -1,7 +1,7 @@ # # spec file for package gstreamer-plugins-base # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,21 +18,19 @@ %define _name gst-plugins-base %define gst_branch 1.0 - +%define gstreamer_plugins_base_req %(xzgrep --text "^GST[_A-Z]*_REQ" %{SOURCE0} | sort -u | sed 's/GST_REQ=/gstreamer >= /') Name: gstreamer-plugins-base Version: 1.12.4 Release: 0 Summary: GStreamer Streaming-Media Framework Plug-Ins License: LGPL-2.1+ AND GPL-2.0+ Group: Productivity/Multimedia/Other -Url: http://gstreamer.freedesktop.org/ +URL: http://gstreamer.freedesktop.org/ Source0: https://gstreamer.freedesktop.org/src/gst-plugins-base/%{_name}-%{version}.… Source1: gstreamer-plugins-base.appdata.xml Source2: baselibs.conf - # PATCH-FIX-UPSTREAM gst-pb-playbin3-fix-accessing-invalid-index.patch bgo#791638 zaitor(a)opensuse.org -- playbin3: Fix accessing invalid index in GstStream when received select-stream event Patch0: gst-pb-playbin3-fix-accessing-invalid-index.patch - BuildRequires: cdparanoia-devel BuildRequires: fdupes BuildRequires: glib2-devel >= 2.40.0 @@ -65,8 +63,6 @@ BuildRequires: pkgconfig(vorbis) >= 1.0 BuildRequires: pkgconfig(vorbisenc) >= 1.0 BuildRequires: pkgconfig(zlib) -PreReq: filesystem -%define gstreamer_plugins_base_req %(xzgrep --text "^GST[_A-Z]*_REQ" %{SOURCE0} | sort -u | sed 's/GST_REQ=/gstreamer >= /') Requires: %{gstreamer_plugins_base_req} Recommends: %{name}-lang Recommends: PackageKit-gstreamer-plugin @@ -448,39 +444,29 @@ %post -n libgstallocators-1_0-0 -p /sbin/ldconfig %postun -n libgstallocators-1_0-0 -p /sbin/ldconfig - %post -n libgstapp-1_0-0 -p /sbin/ldconfig %postun -n libgstapp-1_0-0 -p /sbin/ldconfig - %post -n libgstaudio-1_0-0 -p /sbin/ldconfig %postun -n libgstaudio-1_0-0 -p /sbin/ldconfig - %post -n libgstfft-1_0-0 -p /sbin/ldconfig %postun -n libgstfft-1_0-0 -p /sbin/ldconfig - %post -n libgstpbutils-1_0-0 -p /sbin/ldconfig %postun -n libgstpbutils-1_0-0 -p /sbin/ldconfig - %post -n libgstriff-1_0-0 -p /sbin/ldconfig %postun -n libgstriff-1_0-0 -p /sbin/ldconfig - %post -n libgstrtp-1_0-0 -p /sbin/ldconfig %postun -n libgstrtp-1_0-0 -p /sbin/ldconfig - %post -n libgstrtsp-1_0-0 -p /sbin/ldconfig %postun -n libgstrtsp-1_0-0 -p /sbin/ldconfig - %post -n libgstsdp-1_0-0 -p /sbin/ldconfig %postun -n libgstsdp-1_0-0 -p /sbin/ldconfig - %post -n libgsttag-1_0-0 -p /sbin/ldconfig %postun -n libgsttag-1_0-0 -p /sbin/ldconfig - %post -n libgstvideo-1_0-0 -p /sbin/ldconfig %postun -n libgstvideo-1_0-0 -p /sbin/ldconfig %files -%doc COPYING COPYING.LIB +%license COPYING %{_mandir}/man1/gst-device-monitor-* %{_mandir}/man1/gst-discoverer-* %{_mandir}/man1/gst-play-*

1 0

commit gstreamer-plugins-bad for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '18

02 Mar '18

Hello community, here is the log from the commit of package gstreamer-plugins-bad for openSUSE:Factory checked in at 2018-03-02 21:09:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-bad (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-plugins-bad" Fri Mar 2 21:09:06 2018 rev:73 rq:581651 version:1.12.4 Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-plugins-bad/gstreamer-plugins-bad.changes 2018-02-27 16:56:13.135811913 +0100 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new/gstreamer-plugins-bad.changes 2018-03-02 21:09:07.462515693 +0100 @@ -1,0 +2,17 @@ +Wed Feb 28 21:02:13 UTC 2018 - bjorn.lie(a)gmail.com + +- Split out fluidsynth plugin in new sub-package + gstreamer-plugins-bad-fluidsynth. +- Following the above, add gstreamer-plugins-bad-fluidsynth and + already built sub-package gstreamer-plugins-bad-chromaprint to + baselibs.conf, build 32-bits support for these too. +- Add conditional gstreamer-plugins-bad-fluidsynth and + gstreamer-plugins-bad-chromaprint Requires: to -devel + sub-package. + +------------------------------------------------------------------- +Wed Feb 28 16:31:38 UTC 2018 - dimstar(a)opensuse.org + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-plugins-bad.spec ++++++ --- /var/tmp/diff_new_pack.S2awn0/_old 2018-03-02 21:09:09.470443485 +0100 +++ /var/tmp/diff_new_pack.S2awn0/_new 2018-03-02 21:09:09.474443341 +0100 @@ -18,21 +18,21 @@ # Use rpmbuild -D 'BUILD_ORIG 1' to build original code. # Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon. - %define ENABLE_OPENH264 0 +%define _name gst-plugins-bad +%define gst_branch 1.0 Name: gstreamer-plugins-bad -%define _name gst-plugins-bad Version: 1.12.4 Release: 0 -%define gst_branch 1.0 Summary: GStreamer Streaming-Media Framework Plug-Ins License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Multimedia/Other -Url: http://gstreamer.freedesktop.org/ +URL: http://gstreamer.freedesktop.org/ Source: https://gstreamer.freedesktop.org/src/gst-plugins-bad/%{_name}-%{version}.t… Source2: gstreamer-plugins-bad.appdata.xml Source99: baselibs.conf + # PATCH-FIX-UPSTREAM gst-bad-vtdec-destroy-create-fix.patch zaitor(a)opensuse.org -- vtdec: destroy and create the GL context on start()/stop() Patch0: gst-bad-vtdec-destroy-create-fix.patch # PATCH-FIX-UPSTREAM gst-bad-player-transfer-ownership.patch bgo#791982 zaitor(a)opensuse.org -- player: transfer ownership of info properties @@ -49,6 +49,7 @@ BuildRequires: libjasper-devel BuildRequires: libmpcdec-devel BuildRequires: orc >= 0.4.11 +BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: python3-xml BuildRequires: pkgconfig(OpenEXR) @@ -96,11 +97,6 @@ BuildRequires: pkgconfig(mjpegtools) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(nettle) -# Disabled - checking for opencv2/bgsegm.hpp... no -#BuildRequires: pkgconfig(opencv) -%if 0%{?ENABLE_OPENH264} -BuildRequires: pkgconfig(openh264) >= 1.3.0 -%endif BuildRequires: pkgconfig(openssl) >= 0.9.5 BuildRequires: pkgconfig(opus) >= 0.9.4 BuildRequires: pkgconfig(sbc) @@ -109,6 +105,24 @@ BuildRequires: pkgconfig(soundtouch) BuildRequires: pkgconfig(spandsp) >= 0.0.6 BuildRequires: pkgconfig(vdpau) +BuildRequires: pkgconfig(webrtc-audio-processing) >= 0.2 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) >= 1.10 +Requires(post): glib2-tools +Requires(postun): glib2-tools +# FIXME! - this leads to unresolvables currently +#%%define gstreamer_plugins_bad_req %%(xzgrep --text "^GST.*_REQ" %%{S:0} | sort -u | sed 's/GST_REQ=/gstreamer >= /;s/GSTPB_REQ=/gstreamer-plugins-base >= /' | tr '\\n' ' ') +#Requires: %%gstreamer_plugins_bad_req +# FIXME +Recommends: %{name}-lang +Enhances: gstreamer +# Generic name, never used in SuSE: +Provides: gst-plugins-bad = %{version} +# Disabled - checking for opencv2/bgsegm.hpp... no +#BuildRequires: pkgconfig(opencv) +%if 0%{?ENABLE_OPENH264} +BuildRequires: pkgconfig(openh264) >= 1.3.0 +%endif %if 0%{?suse_version} >= 1500 BuildRequires: pkgconfig(wayland-client) >= 1.0.0 BuildRequires: pkgconfig(wayland-cursor) >= 1.0 @@ -116,24 +130,19 @@ BuildRequires: pkgconfig(wayland-protocols) >= 1.4 BuildRequires: pkgconfig(wayland-scanner) >= 1.4.0 %endif -BuildRequires: pkgconfig(webrtc-audio-processing) >= 0.2 -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xcb) >= 1.10 - %if 0%{?is_opensuse} BuildRequires: libbs2b-devel BuildRequires: pkgconfig(fluidsynth) -%if 0%{?suse_version} >= 1500 -BuildRequires: pkgconfig(graphene-1.0) >= 1.4.0 -%endif BuildRequires: pkgconfig(libchromaprint) BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(tiger) >= 0.3.2 BuildRequires: pkgconfig(zbar) >= 0.9 BuildRequires: pkgconfig(zvbi-0.2) +%if 0%{?suse_version} >= 1500 +BuildRequires: pkgconfig(graphene-1.0) >= 1.4.0 +%endif %endif - %if 0%{?BUILD_ORIG} BuildRequires: faac-devel BuildRequires: faad2-devel @@ -146,19 +155,6 @@ BuildRequires: pkgconfig(vo-amrwbenc) >= 0.1.0 BuildRequires: pkgconfig(x265) %endif - -Requires(post): glib2-tools -Requires(postun): glib2-tools - -# FIXME! - this leads to unresolvables currently -#%%define gstreamer_plugins_bad_req %%(xzgrep --text "^GST.*_REQ" %%{S:0} | sort -u | sed 's/GST_REQ=/gstreamer >= /;s/GSTPB_REQ=/gstreamer-plugins-base >= /' | tr '\\n' ' ') -#Requires: %%gstreamer_plugins_bad_req -# FIXME - -Recommends: %{name}-lang -Enhances: gstreamer -# Generic name, never used in SuSE: -Provides: gst-plugins-bad = %{version} %if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG_ADDON} Provides: patched_subset @@ -169,7 +165,6 @@ %else Provides: patched_subset %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GStreamer is a streaming media framework based on graphs of filters @@ -185,6 +180,13 @@ %description chromaprint Add chromaprint (Audio Fingerprinting) support to any GStreamer based tool. +%package fluidsynth +Summary: Fluidsynth plugin for GStreamer +Group: Productivity/Multimedia/Other + +%description fluidsynth +Add fluidsynth midi support to any GStreamer based tool. + %package -n libgstadaptivedemux-1_0-0 Summary: GStreamer Streaming-Media Framework Plug-Ins Group: System/Libraries @@ -368,14 +370,18 @@ Requires: libgstphotography-1_0-0 = %{version} Requires: libgstplayer-1_0-0 = %{version} Requires: libgsturidownloader-1_0-0 = %{version} -%if 0%{?suse_version} >= 1500 -Requires: libgstwayland-1_0-0 = %{version} -%endif Requires: typelib-1_0-GstBadAllocators-1_0 = %{version} Requires: typelib-1_0-GstGL-1_0 = %{version} Requires: typelib-1_0-GstInsertBin-1_0 = %{version} Requires: typelib-1_0-GstMpegts-1_0 = %{version} Requires: typelib-1_0-GstPlayer-1_0 = %{version} +%if 0%{?suse_version} >= 1500 +Requires: libgstwayland-1_0-0 = %{version} +%endif +%if 0%{?is_opensuse} +Requires: gstreamer-plugins-bad-chromaprint +Requires: gstreamer-plugins-bad-fluidsynth +%endif %description devel GStreamer is a streaming media framework based on graphs of filters @@ -470,7 +476,7 @@ %autosetup -n %{_name}-%{version} -p1 %build -export PYTHON=/usr/bin/python3 +export PYTHON=%{_bindir}/python3 %configure \ %if ! 0%{?BUILD_ORIG} --with-package-name='openSUSE GStreamer-plugins-bad package' \ @@ -498,11 +504,11 @@ false else mkdir -p %{buildroot}%{_datadir}/appdata - cp %{S:2} %{buildroot}%{_datadir}/appdata/ + cp %{SOURCE2} %{buildroot}%{_datadir}/appdata/ fi # end appdata fail test -find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print +find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{_name}-%{gst_branch} %fdupes %{buildroot}%{_datadir}/gtk-doc/html/ @@ -549,7 +555,7 @@ %endif %files -%doc COPYING COPYING.LIB +%license COPYING %dir %{_datadir}/gstreamer-%{gst_branch}/presets/ %{_datadir}/gstreamer-%{gst_branch}/presets/GstFreeverb.prs %dir %{_datadir}/appdata/ @@ -663,7 +669,6 @@ # Explicitly list openSUSE only plugins %if 0%{?is_opensuse} %{_libdir}/gstreamer-%{gst_branch}/libgstbs2b.so -%{_libdir}/gstreamer-%{gst_branch}/libgstfluidsynthmidi.so %{_libdir}/gstreamer-%{gst_branch}/libgstopenal.so %{_libdir}/gstreamer-%{gst_branch}/libgstopenjpeg.so %{_libdir}/gstreamer-%{gst_branch}/libgstteletext.so @@ -671,6 +676,9 @@ %files chromaprint %{_libdir}/gstreamer-%{gst_branch}/libgstchromaprint.so + +%files fluidsynth +%{_libdir}/gstreamer-%{gst_branch}/libgstfluidsynthmidi.so %endif %files -n libgstadaptivedemux-1_0-0 @@ -721,23 +729,18 @@ %endif %files -n typelib-1_0-GstBadAllocators-1_0 -%defattr(-, root, root) %{_libdir}/girepository-1.0/GstBadAllocators-1.0.typelib %files -n typelib-1_0-GstGL-1_0 -%defattr(-, root, root) %{_libdir}/girepository-1.0/GstGL-1.0.typelib %files -n typelib-1_0-GstInsertBin-1_0 -%defattr(-, root, root) %{_libdir}/girepository-1.0/GstInsertBin-1.0.typelib %files -n typelib-1_0-GstMpegts-1_0 -%defattr(-, root, root) %{_libdir}/girepository-1.0/GstMpegts-1.0.typelib %files -n typelib-1_0-GstPlayer-1_0 -%defattr(-, root, root) %{_libdir}/girepository-1.0/GstPlayer-1.0.typelib %files devel @@ -768,7 +771,6 @@ %if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG_ADDON} - %files orig-addon %endif %{_datadir}/gstreamer-%{gst_branch}/presets/GstVoAmrwbEnc.prs ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.S2awn0/_old 2018-03-02 21:09:09.518441759 +0100 +++ /var/tmp/diff_new_pack.S2awn0/_new 2018-03-02 21:09:09.518441759 +0100 @@ -1,4 +1,6 @@ gstreamer-plugins-bad +gstreamer-plugins-bad-chromaprint +gstreamer-plugins-bad-fluidsynth gstreamer-plugins-bad-orig-addon libgstadaptivedemux-1_0-0 libgstbadaudio-1_0-0

1 0

commit libical for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '18

02 Mar '18

Hello community, here is the log from the commit of package libical for openSUSE:Factory checked in at 2018-03-02 21:08:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libical (Old) and /work/SRC/openSUSE:Factory/.libical.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libical" Fri Mar 2 21:08:58 2018 rev:39 rq:581627 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libical/libical.changes 2017-06-30 18:41:18.147073772 +0200 +++ /work/SRC/openSUSE:Factory/.libical.new/libical.changes 2018-03-02 21:09:01.866716926 +0100 @@ -1,0 +2,5 @@ +Wed Feb 28 16:35:25 UTC 2018 - dimstar(a)opensuse.org + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libical.spec ++++++ --- /var/tmp/diff_new_pack.Uk0yDa/_old 2018-03-02 21:09:03.254667013 +0100 +++ /var/tmp/diff_new_pack.Uk0yDa/_new 2018-03-02 21:09:03.258666870 +0100 @@ -1,7 +1,7 @@ # # spec file for package libical # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,14 @@ # +%define sonum 2 Name: libical Version: 2.0.0 Release: 0 -%define sonum 2 Summary: An Implementation of Basic iCAL Protocols -License: MPL-1.0 or LGPL-2.1 +License: MPL-1.0 OR LGPL-2.1-only Group: Development/Libraries/C and C++ -Url: http://sourceforge.net/projects/freeassociation/ - +URL: http://sourceforge.net/projects/freeassociation/ #Git-Clone: https://github.com/libical/libical Source: https://github.com/libical/libical/releases/download/v%{version}/%{name}-%{… Source2: baselibs.conf @@ -41,9 +40,8 @@ Patch6: libical-boo1015964-use-after-free.patch BuildRequires: cmake >= 2.4 BuildRequires: gcc-c++ -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(icu-i18n) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Libical is an open source implementation of the IETF's iCalendar @@ -100,7 +98,7 @@ %prep %setup -q -%patch -P 1 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -116,27 +114,23 @@ rm examples/CMakeLists.txt %post -n %{name}%{sonum} -p /sbin/ldconfig - %postun -n %{name}%{sonum} -p /sbin/ldconfig %files -n %{name}%{sonum} -%defattr(-,root,root) -%doc AUTHORS ReadMe.txt ReleaseNotes.txt COPYING LICENSE TEST THANKS TODO +%license COPYING +%doc AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO %{_libdir}/*.so.* %files devel -%defattr(-,root,root) %{_libdir}/*.so %{_libdir}/pkgconfig/libical.pc %{_includedir}/libical/ %{_libdir}/cmake/LibIcal/ %files devel-static -%defattr(-,root,root) %{_libdir}/*.a %files doc -%defattr(-,root,root) %doc doc/*.txt %doc examples/

1 0