January 2020 - openSUSE Commits - openSUSE Mailing Lists

commit glib2 for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package glib2 for openSUSE:Leap:15.2 checked in at 2020-01-30 16:10:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/glib2 (Old) and /work/SRC/openSUSE:Leap:15.2/.glib2.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glib2" Thu Jan 30 16:10:56 2020 rev:46 rq:768730 version:2.62.4 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/glib2/glib2.changes 2020-01-30 14:47:17.062803026 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.glib2.new.26092/glib2.changes 2020-01-30 16:10:57.397870658 +0100 @@ -1,0 +2,25 @@ +Thu Dec 19 17:45:31 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 2.62.4: + + Apply recursion depth limits to variants in D-Bus messages. + + Bugs fixed: glgo#GNOME/GLib#1938, glgo#GNOME/GLib!1240, + glgo#GNOME/GLib!1257, glgo#GNOME/GLib!1266, + glgo#GNOME/GLib!1276, glgo#GNOME/GLib!1290. + +------------------------------------------------------------------- +Tue Nov 19 20:25:30 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 2.62.3: + + Use `poll()` in `g_spawn_sync()` rather than `select()`, which + is subject to FD limits. + + Fix undefined behaviour with `g_utf8_find_prev_char()`. + + Bugs fixed: glgo#GNOME/GLib#954, glgo#GNOME/GLib#1318, + glgo#GNOME/GLib#1897, glgo#GNOME/GLib#1903, + glgo#GNOME/GLib#1916, glgo#GNOME/GLib#1917, + glgo#GNOME/GLib!1174, glgo#GNOME/GLib!1184, + glgo#GNOME/GLib!1194, glgo#GNOME/GLib!1203, + glgo#GNOME/GLib!1207, glgo#GNOME/GLib!1215, + glgo#GNOME/GLib!1219, glgo#GNOME/GLib!1222, + glgo#GNOME/GLib!1228. + +------------------------------------------------------------------- Old: ---- glib-2.62.2.tar.xz New: ---- glib-2.62.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.ke73Ku/_old 2020-01-30 16:10:59.453871675 +0100 +++ /var/tmp/diff_new_pack.ke73Ku/_new 2020-01-30 16:10:59.457871677 +0100 @@ -1,7 +1,7 @@ # # spec file for package glib2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_without systemtap Name: glib2 -Version: 2.62.2 +Version: 2.62.4 Release: 0 Summary: General-Purpose Utility Library License: LGPL-2.1-or-later ++++++ glib-2.62.2.tar.xz -> glib-2.62.4.tar.xz ++++++ ++++ 2360 lines of diff (skipped)

1 0

commit platformsh-cli for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package platformsh-cli for openSUSE:Leap:15.2 checked in at 2020-01-30 15:47:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/platformsh-cli (Old) and /work/SRC/openSUSE:Leap:15.2/.platformsh-cli.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "platformsh-cli" Thu Jan 30 15:47:13 2020 rev:39 rq:768515 version:3.52.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/platformsh-cli/platformsh-cli.changes 2020-01-30 06:09:18.438494804 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.platformsh-cli.new.26092/platformsh-cli.changes 2020-01-30 15:47:38.713303907 +0100 @@ -1,0 +2,10 @@ +Wed Jan 29 16:30:45 UTC 2020 - jimmy(a)boombatower.com + +- Update to version 3.52.1: + * Release v3.52.1 + * Update dependencies (Symfony -> 3.4.37) + * Update client (oauth2 compatibility) + * Suggest SSH to the Git server to test the connection in 'get' command (#898) + * Pipe to command in db:size to avoid quoting issues on Windows (#899) + +------------------------------------------------------------------- Old: ---- platformsh-cli-3.52.0.tar.xz New: ---- platformsh-cli-3.52.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ platformsh-cli.spec ++++++ --- /var/tmp/diff_new_pack.WCtseC/_old 2020-01-30 15:47:40.009304297 +0100 +++ /var/tmp/diff_new_pack.WCtseC/_new 2020-01-30 15:47:40.013304298 +0100 @@ -17,7 +17,7 @@ Name: platformsh-cli -Version: 3.52.0 +Version: 3.52.1 Release: 0 Summary: Tool for managing Platform.sh services from the command line # See licenses.txt for dependency licenses. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.WCtseC/_old 2020-01-30 15:47:40.041304306 +0100 +++ /var/tmp/diff_new_pack.WCtseC/_new 2020-01-30 15:47:40.045304308 +0100 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="disabled"> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> - <param name="revision">refs/tags/v3.52.0</param> + <param name="revision">refs/tags/v3.52.1</param> <param name="url">git://github.com/platformsh/platformsh-cli.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.WCtseC/_old 2020-01-30 15:47:40.061304313 +0100 +++ /var/tmp/diff_new_pack.WCtseC/_new 2020-01-30 15:47:40.061304313 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/platformsh/platformsh-cli.git</param> - <param name="changesrevision">28172cbcf9d23cbce6c0f3449fc9599b0e4229a1</param> + <param name="changesrevision">0f776ae4191f1fe10c015f27c6b7cadcd104c5a5</param> </service> </servicedata> ++++++ licenses.txt ++++++ --- /var/tmp/diff_new_pack.WCtseC/_old 2020-01-30 15:47:40.101304325 +0100 +++ /var/tmp/diff_new_pack.WCtseC/_new 2020-01-30 15:47:40.101304325 +0100 @@ -5,7 +5,7 @@ Name Version License cocur/slugify v2.5 MIT -composer/ca-bundle 1.2.4 MIT +composer/ca-bundle 1.2.6 MIT doctrine/cache v1.6.2 MIT firebase/php-jwt v2.2.0 BSD-3-Clause guzzlehttp/cache-subscriber 0.2.0 MIT @@ -16,20 +16,20 @@ padraic/phar-updater v1.0.6 BSD-3-Clause paragonie/random_compat v2.0.18 MIT pjcdawkins/guzzle-oauth2-plugin v2.2.0 MIT -platformsh/client v0.31.0 MIT +platformsh/client v0.31.2 MIT platformsh/console-form v0.0.24 MIT psr/container 1.0.0 MIT psr/log 1.1.2 MIT react/promise v2.7.1 MIT stecman/symfony-console-completion 0.10.1 MIT -symfony/config v3.4.36 MIT -symfony/console v3.4.36 MIT -symfony/debug v3.4.36 MIT -symfony/dependency-injection v3.4.36 MIT -symfony/event-dispatcher v3.4.36 MIT -symfony/filesystem v3.4.36 MIT -symfony/finder v3.4.36 MIT +symfony/config v3.4.37 MIT +symfony/console v3.4.37 MIT +symfony/debug v3.4.37 MIT +symfony/dependency-injection v3.4.37 MIT +symfony/event-dispatcher v3.4.37 MIT +symfony/filesystem v3.4.37 MIT +symfony/finder v3.4.37 MIT symfony/polyfill-ctype v1.13.1 MIT symfony/polyfill-mbstring v1.13.1 MIT -symfony/process v3.4.36 MIT -symfony/yaml v3.4.36 MIT +symfony/process v3.4.37 MIT +symfony/yaml v3.4.37 MIT ++++++ platformsh-cli-3.52.0.tar.xz -> platformsh-cli-3.52.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.52.0/composer.lock new/platformsh-cli-3.52.1/composer.lock --- old/platformsh-cli-3.52.0/composer.lock 2020-01-24 22:46:43.000000000 +0100 +++ new/platformsh-cli-3.52.1/composer.lock 2020-01-29 12:29:32.000000000 +0100 @@ -72,16 +72,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.2.4", + "version": "1.2.6", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527" + "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/10bb96592168a0f8e8f…", - "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/47fe531de31fca4a1b9…", + "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e", "shasum": "" }, "require": { @@ -92,7 +92,7 @@ "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", "psr/log": "^1.0", - "symfony/process": "^2.5 || ^3.0 || ^4.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" }, "type": "library", "extra": { @@ -124,7 +124,7 @@ "ssl", "tls" ], - "time": "2019-08-30T08:44:50+00:00" + "time": "2020-01-13T10:02:55+00:00" }, { "name": "doctrine/cache", @@ -394,6 +394,7 @@ } ], "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.", + "abandoned": true, "time": "2018-07-31T13:22:33+00:00" }, { @@ -444,6 +445,7 @@ "Guzzle", "stream" ], + "abandoned": true, "time": "2014-10-12T19:18:40+00:00" }, { @@ -663,16 +665,16 @@ }, { "name": "platformsh/client", - "version": "v0.31.0", + "version": "v0.31.2", "source": { "type": "git", "url": "https://github.com/platformsh/platformsh-client-php.git", - "reference": "880f5464894baff81d16ace340443601844a208c" + "reference": "073a925c8524169675495234d68b72d77f411a12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/880f5…", - "reference": "880f5464894baff81d16ace340443601844a208c", + "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/073a9…", + "reference": "073a925c8524169675495234d68b72d77f411a12", "shasum": "" }, "require": { @@ -702,7 +704,7 @@ } ], "description": "Platform.sh API client", - "time": "2019-12-16T09:37:35+00:00" + "time": "2020-01-29T10:13:08+00:00" }, { "name": "platformsh/console-form", @@ -932,16 +934,16 @@ }, { "name": "symfony/config", - "version": "v3.4.36", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "a599a867d0e4a07c342b5f1e656b3915a540ddbe" + "reference": "6abc18b2a97f63508d23929bbb2ae65aaa07bace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/a599a867d0e4a07c342b5f1…", - "reference": "a599a867d0e4a07c342b5f1e656b3915a540ddbe", + "url": "https://api.github.com/repos/symfony/config/zipball/6abc18b2a97f63508d23929…", + "reference": "6abc18b2a97f63508d23929bbb2ae65aaa07bace", "shasum": "" }, "require": { @@ -992,20 +994,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2019-12-01T10:45:41+00:00" + "time": "2020-01-04T12:05:51+00:00" }, { "name": "symfony/console", - "version": "v3.4.36", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "1ee23b3b659b06c622f2bd2492a229e416eb4586" + "reference": "7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/1ee23b3b659b06c622f2bd…", - "reference": "1ee23b3b659b06c622f2bd2492a229e416eb4586", + "url": "https://api.github.com/repos/symfony/console/zipball/7c5bdd346f9d90a2d22d4e…", + "reference": "7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12", "shasum": "" }, "require": { @@ -1064,20 +1066,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-12-01T10:04:45+00:00" + "time": "2020-01-10T07:52:48+00:00" }, { "name": "symfony/debug", - "version": "v3.4.36", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086" + "reference": "70dd18e93bb8bdf3c4db7fde832619fef9828cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/f72e33fdb1170b326e72c315…", - "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086", + "url": "https://api.github.com/repos/symfony/debug/zipball/70dd18e93bb8bdf3c4db7fde…", + "reference": "70dd18e93bb8bdf3c4db7fde832619fef9828cf8", "shasum": "" }, "require": { @@ -1120,20 +1122,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "time": "2020-01-08T16:36:15+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.4.36", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "0d201916bfb3af939fec3c0c8815ea16c60ac1a2" + "reference": "22000f10c9e1cfef051e8b4de46815b41a0223fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0d201916b…", - "reference": "0d201916bfb3af939fec3c0c8815ea16c60ac1a2", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/22000f10c…", + "reference": "22000f10c9e1cfef051e8b4de46815b41a0223fc", "shasum": "" }, "require": { @@ -1191,20 +1193,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2019-12-01T08:33:36+00:00" + "time": "2020-01-08T11:20:51+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.36", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177" + "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f9031c22ec127…", - "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/79ede8f2836e5…", + "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8", "shasum": "" }, "require": { @@ -1254,20 +1256,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "time": "2020-01-04T12:05:51+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.36", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "00cdad0936d06fab136944bc2342b762b1c3a4a2" + "reference": "0a0d3b4bda11aa3a0464531c40e681e184e75628" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/00cdad0936d06fab136…", - "reference": "00cdad0936d06fab136944bc2342b762b1c3a4a2", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0a0d3b4bda11aa3a046…", + "reference": "0a0d3b4bda11aa3a0464531c40e681e184e75628", "shasum": "" }, "require": { @@ -1304,20 +1306,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-11-25T16:36:22+00:00" + "time": "2020-01-17T08:50:08+00:00" }, { "name": "symfony/finder", - "version": "v3.4.36", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "290ae21279b37bfd287cdcce640d51204e84afdf" + "reference": "a90a9d3b9f458a5cdeabfa4090b20c000ca3962f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/290ae21279b37bfd287cdcc…", - "reference": "290ae21279b37bfd287cdcce640d51204e84afdf", + "url": "https://api.github.com/repos/symfony/finder/zipball/a90a9d3b9f458a5cdeabfa4…", + "reference": "a90a9d3b9f458a5cdeabfa4090b20c000ca3962f", "shasum": "" }, "require": { @@ -1353,7 +1355,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-11-17T21:55:15+00:00" + "time": "2020-01-01T11:03:25+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1474,16 +1476,16 @@ }, { "name": "symfony/process", - "version": "v3.4.36", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "9a4545c01e1e4f473492bd52b71e574dcc401ca2" + "reference": "5b9d2bcffe4678911a4c941c00b7c161252cf09a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/9a4545c01e1e4f473492bd…", - "reference": "9a4545c01e1e4f473492bd52b71e574dcc401ca2", + "url": "https://api.github.com/repos/symfony/process/zipball/5b9d2bcffe4678911a4c94…", + "reference": "5b9d2bcffe4678911a4c941c00b7c161252cf09a", "shasum": "" }, "require": { @@ -1519,20 +1521,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-11-28T10:05:51+00:00" + "time": "2020-01-01T11:03:25+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.36", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "dab657db15207879217fc81df4f875947bf68804" + "reference": "aa46bc2233097d5212332c907f9911533acfbf80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/dab657db15207879217fc81df…", - "reference": "dab657db15207879217fc81df4f875947bf68804", + "url": "https://api.github.com/repos/symfony/yaml/zipball/aa46bc2233097d5212332c907…", + "reference": "aa46bc2233097d5212332c907f9911533acfbf80", "shasum": "" }, "require": { @@ -1578,7 +1580,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "time": "2020-01-13T08:00:59+00:00" } ], "packages-dev": [ @@ -1879,25 +1881,25 @@ }, { "name": "dnoegel/php-xdg-base-dir", - "version": "0.1", + "version": "v0.1.1", "source": { "type": "git", "url": "https://github.com/dnoegel/php-xdg-base-dir.git", - "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a" + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/265b8593498b9…", - "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a", + "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb…", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", "shasum": "" }, "require": { "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "@stable" + "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" }, - "type": "project", + "type": "library", "autoload": { "psr-4": { "XdgBaseDir\\": "src/" @@ -1908,7 +1910,7 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24T07:27:01+00:00" + "time": "2019-12-04T15:06:13+00:00" }, { "name": "doctrine/instantiator", @@ -2419,33 +2421,33 @@ }, { "name": "phpspec/prophecy", - "version": "1.9.0", + "version": "v1.10.2", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203" + "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a…", - "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b4400efc9d206e83138e2…", + "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", - "sebastian/comparator": "^1.1|^2.0|^3.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0" + "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" }, "require-dev": { - "phpspec/phpspec": "^2.5|^3.2", + "phpspec/phpspec": "^2.5 || ^3.2", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.10.x-dev" } }, "autoload": { @@ -2478,7 +2480,7 @@ "spy", "stub" ], - "time": "2019-10-03T11:07:50+00:00" + "time": "2020-01-20T15:57:02+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2859,20 +2861,20 @@ }, { "name": "psy/psysh", - "version": "v0.9.11", + "version": "v0.9.12", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "75d9ac1c16db676de27ab554a4152b594be4748e" + "reference": "90da7f37568aee36b116a030c5f99c915267edd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/75d9ac1c16db676de27ab5…", - "reference": "75d9ac1c16db676de27ab554a4152b594be4748e", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/90da7f37568aee36b116a0…", + "reference": "90da7f37568aee36b116a030c5f99c915267edd4", "shasum": "" }, "require": { - "dnoegel/php-xdg-base-dir": "0.1", + "dnoegel/php-xdg-base-dir": "0.1.*", "ext-json": "*", "ext-tokenizer": "*", "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*", @@ -2929,7 +2931,7 @@ "interactive", "shell" ], - "time": "2019-11-27T22:44:29+00:00" + "time": "2019-12-06T14:19:43+00:00" }, { "name": "sebastian/comparator", @@ -3305,16 +3307,16 @@ }, { "name": "symfony/var-dumper", - "version": "v3.4.36", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "569e261461600810845a8305ca3f64abd3e712c0" + "reference": "51ecb139114c38080801145a212f10210ea99ea3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/569e261461600810845…", - "reference": "569e261461600810845a8305ca3f64abd3e712c0", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/51ecb139114c3808080…", + "reference": "51ecb139114c38080801145a212f10210ea99ea3", "shasum": "" }, "require": { @@ -3370,7 +3372,7 @@ "debug", "dump" ], - "time": "2019-10-10T11:03:19+00:00" + "time": "2020-01-01T11:03:25+00:00" }, { "name": "webflo/drupal-finder", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.52.0/dist/manifest.json new/platformsh-cli-3.52.1/dist/manifest.json --- old/platformsh-cli-3.52.0/dist/manifest.json 2020-01-24 22:46:43.000000000 +0100 +++ new/platformsh-cli-3.52.1/dist/manifest.json 2020-01-29 12:29:32.000000000 +0100 @@ -17,10 +17,10 @@ }, { "name": "platform.phar", - "sha1": "f230b9726c3b301da91af812bf96f495884d2f69", - "sha256": "b6bd5acd975466edcdd85a982b450143286914c8e02b78731b67d9b9a834eda1", - "url": "https://github.com/platformsh/platformsh-cli/releases/download/v3.52.0/plat…", - "version": "3.52.0", + "sha1": "c7b03ff56dbd10b70a137baa86af7900ccfe5a22", + "sha256": "4d74907c3c2a988aa71754a80bde358a890032568b820b8e5d544ced617884f3", + "url": "https://github.com/platformsh/platformsh-cli/releases/download/v3.52.1/plat…", + "version": "3.52.1", "php": { "min": "5.5.9" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.52.0/src/Command/Db/DbSizeCommand.php new/platformsh-cli-3.52.1/src/Command/Db/DbSizeCommand.php --- old/platformsh-cli-3.52.0/src/Command/Db/DbSizeCommand.php 2020-01-24 22:46:43.000000000 +0100 +++ new/platformsh-cli-3.52.1/src/Command/Db/DbSizeCommand.php 2020-01-29 12:29:32.000000000 +0100 @@ -131,7 +131,7 @@ * @return void */ private function checkInnoDbTablesInNeedOfOptimizing($host, array $database) { - $tablesNeedingCleanup = $host->runCommand($this->mysqlTablesInNeedOfOptimizing($database)); + $tablesNeedingCleanup = $host->runCommand($this->getMysqlCommand($database), true, true, $this->mysqlTablesInNeedOfOptimizing()); $queries = []; if (is_string($tablesNeedingCleanup)) { $queries = $this->getCleanupQueries(explode("\n", $tablesNeedingCleanup)); @@ -156,9 +156,10 @@ $this->stdErr->writeln(''); if ($this->getService('question_helper')->confirm('Do you want to run these queries now?', false)) { + $mysqlCommand = $this->getMysqlCommand($database); foreach ($queries as $query) { $this->stdErr->write($query); - $host->runCommand($this->getMysqlCommand($database, $query)); + $host->runCommand($mysqlCommand, true, true, $query); $this->stdErr->writeln('<options=bold;fg=green> [OK]</>'); } } @@ -211,113 +212,103 @@ } /** - * Returns a command to query disk usage for a PostgreSQL database. - * - * @param array $database The database connection details. + * Returns a query to find disk usage for a PostgreSQL database. * * @return string */ - private function psqlQuery(array $database) + private function psqlQuery() { //both these queries are wrong... //$query = 'SELECT SUM(pg_database_size(t1.datname)) as size FROM pg_database t1'; //does miss lots of data //$query = 'SELECT SUM(pg_total_relation_size(pg_class.oid)) AS size FROM pg_class LEFT OUTER JOIN pg_namespace ON (pg_namespace.oid = pg_class.relnamespace)'; //but running both, and taking the average, gets us closer to the correct value - $query = 'SELECT AVG(size) FROM (SELECT SUM(pg_database_size(t1.datname)) as size FROM pg_database t1 UNION SELECT SUM(pg_total_relation_size(pg_class.oid)) AS size FROM pg_class LEFT OUTER JOIN pg_namespace ON (pg_namespace.oid = pg_class.relnamespace)) x;';//too much + return 'SELECT AVG(size) FROM (SELECT SUM(pg_database_size(t1.datname)) as size FROM pg_database t1 UNION SELECT SUM(pg_total_relation_size(pg_class.oid)) AS size FROM pg_class LEFT OUTER JOIN pg_namespace ON (pg_namespace.oid = pg_class.relnamespace)) x;'; + } + /** + * Returns the psql CLI client command. + * + * @param array $database + * + * @return string + */ + private function getPsqlCommand(array $database) { /** @var \Platformsh\Cli\Service\Relationships $relationships */ $relationships = $this->getService('relationships'); $dbUrl = $relationships->getDbCommandArgs('psql', $database, ''); return sprintf( - 'psql --echo-hidden -t --no-align %s -c %s', - $dbUrl, - OsUtil::escapePosixShellArg($query) + 'psql --echo-hidden -t --no-align %s', + $dbUrl ); } /** - * Returns the mysql CLI client command for an SQL query. + * Returns the mysql CLI client command. * * @param array $database - * @param string $query * * @return string */ - private function getMysqlCommand(array $database, $query) { + private function getMysqlCommand(array $database) { /** @var \Platformsh\Cli\Service\Relationships $relationships */ $relationships = $this->getService('relationships'); $connectionParams = $relationships->getDbCommandArgs('mysql', $database, ''); return sprintf( - 'mysql %s --no-auto-rehash --raw --skip-column-names --execute %s', - $connectionParams, - OsUtil::escapePosixShellArg($query) + 'mysql %s --no-auto-rehash --raw --skip-column-names', + $connectionParams ); } /** * Returns a command to query table size of non-InnoDB using tables for a MySQL database in MB * - * @param array $database The database connection details. * @param bool $excludeInnoDb * * @return string */ - private function mysqlNonInnodbQuery(array $database, $excludeInnoDb = true) + private function mysqlNonInnodbQuery($excludeInnoDb = true) { - $query = 'SELECT' + return 'SELECT' . ' (' . 'SUM(data_length+index_length+data_free)' . ' + (COUNT(*) * 300 * 1024)' . ')' . ' AS estimated_actual_disk_usage' . ' FROM information_schema.tables' - . ($excludeInnoDb ? ' WHERE ENGINE <> "InnoDB"' : ''); - - return $this->getMysqlCommand($database, $query); + . ($excludeInnoDb ? ' WHERE ENGINE <> "InnoDB"' : '') + . ';'; } /** * Returns a MySQL query to find disk usage for all InnoDB tables. * - * @param array $database The database connection details. - * * @return string */ - private function mysqlInnodbQuery(array $database) + private function mysqlInnodbQuery() { - $query = 'SELECT SUM(ALLOCATED_SIZE) FROM information_schema.innodb_sys_tablespaces;'; - - return $this->getMysqlCommand($database, $query); + return 'SELECT SUM(ALLOCATED_SIZE) FROM information_schema.innodb_sys_tablespaces;'; } /** * Returns a MySQL query to find if the InnoDB ALLOCATED_SIZE column exists. * - * @param array $database - * * @return string */ - private function mysqlInnodbAllocatedSizeExists(array $database) { - $query = 'SELECT count(COLUMN_NAME) FROM information_schema.COLUMNS WHERE table_schema ="information_schema" AND table_name="innodb_sys_tablespaces" AND column_name LIKE "ALLOCATED_SIZE";'; - - return $this->getMysqlCommand($database, $query); + private function mysqlInnodbAllocatedSizeExists() { + return 'SELECT count(COLUMN_NAME) FROM information_schema.COLUMNS WHERE table_schema ="information_schema" AND table_name="innodb_sys_tablespaces" AND column_name LIKE "ALLOCATED_SIZE";'; } /** * Returns a MySQL query to find InnoDB tables needing optimization. * - * @param array $database The database connection details. - * * @return string */ - private function mysqlTablesInNeedOfOptimizing(array $database) { + private function mysqlTablesInNeedOfOptimizing() { /*, data_free, data_length, ((data_free+1)/(data_length+1))*100 as wasted_space_percentage*/ - $query = 'SELECT TABLE_SCHEMA, TABLE_NAME FROM information_schema.tables WHERE ENGINE = "InnoDB" AND ((data_free+1)/(data_length+1))*100 >= '.self::WASTED_SPACE_WARNING_THRESHOLD.' ORDER BY data_free DESC LIMIT 10'; - - return $this->getMysqlCommand($database, $query); + return 'SELECT TABLE_SCHEMA, TABLE_NAME FROM information_schema.tables WHERE ENGINE = "InnoDB" AND ((data_free+1)/(data_length+1))*100 >= '.self::WASTED_SPACE_WARNING_THRESHOLD.' ORDER BY data_free DESC LIMIT 10'; } /** @@ -345,7 +336,7 @@ * @return int Estimated usage in bytes */ private function getPgSqlUsage(HostInterface $host, array $database) { - return (int) $host->runCommand($this->psqlQuery($database)); + return (int) $host->runCommand($this->getPsqlCommand($database), true, true, $this->psqlQuery()); } /** @@ -358,12 +349,12 @@ */ private function getMySqlUsage(HostInterface $host, array $database) { $this->debug('Getting MySQL usage...'); - $allocatedSizeSupported = $host->runCommand($this->mysqlInnodbAllocatedSizeExists($database)); + $allocatedSizeSupported = $host->runCommand($this->getMysqlCommand($database), true, true, $this->mysqlInnodbAllocatedSizeExists()); $innoDbSize = 0; if ($allocatedSizeSupported) { $this->debug('Checking InnoDB separately for more accurate results...'); try { - $innoDbSize = $host->runCommand($this->mysqlInnodbQuery($database)); + $innoDbSize = $host->runCommand($this->getMysqlCommand($database), true, true, $this->mysqlInnodbQuery()); } catch (\Symfony\Component\Process\Exception\RuntimeException $e) { // Some configurations do not have PROCESS privilege(s) and thus have no access to the sys_tablespaces // table. Ignore MySQL's 1227 Access Denied error, and revert to the legacy calculation. @@ -376,7 +367,7 @@ } } - $otherSizes = $host->runCommand($this->mysqlNonInnodbQuery($database, (bool) $allocatedSizeSupported)); + $otherSizes = $host->runCommand($this->getMysqlCommand($database), true, true, $this->mysqlNonInnodbQuery((bool) $allocatedSizeSupported)); return (int) $otherSizes + (int) $innoDbSize; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.52.0/src/Command/Project/ProjectGetCommand.php new/platformsh-cli-3.52.1/src/Command/Project/ProjectGetCommand.php --- old/platformsh-cli-3.52.0/src/Command/Project/ProjectGetCommand.php 2020-01-24 22:46:43.000000000 +0100 +++ new/platformsh-cli-3.52.1/src/Command/Project/ProjectGetCommand.php 2020-01-29 12:29:32.000000000 +0100 @@ -118,7 +118,7 @@ $this->config()->get('service.name') )); - $this->suggestSshRemedies(); + $this->suggestSshRemedies($gitUrl); return 1; } @@ -300,8 +300,10 @@ /** * Suggest SSH key commands for the user, if the Git connection fails. + * + * @param string $gitUrl */ - protected function suggestSshRemedies() + protected function suggestSshRemedies($gitUrl) { $sshKeys = []; try { @@ -310,18 +312,27 @@ // Ignore exceptions. } - if (!empty($sshKeys)) { - $this->stdErr->writeln(''); - $this->stdErr->writeln('Please check your SSH credentials'); - $this->stdErr->writeln(sprintf( - 'You can list your keys with: <comment>%s ssh-keys</comment>', - $this->config()->get('application.executable') - )); - } else { + $this->stdErr->writeln(''); + + if (empty($sshKeys)) { $this->stdErr->writeln(sprintf( 'You probably need to add an SSH key, with: <comment>%s ssh-key:add</comment>', $this->config()->get('application.executable') )); + return; + } + + $this->stdErr->writeln('Please check your SSH credentials'); + $this->stdErr->writeln(sprintf( + 'You can list your keys by running: <comment>%s ssh-keys</comment>', + $this->config()->get('application.executable') + )); + + if (strpos($gitUrl, ':') !== false) { + list($gitSshUrl,) = explode(':', $gitUrl, 2); + $this->stdErr->writeln(''); + $this->stdErr->writeln('You can test your connection to the Git server by running:'); + $this->stdErr->writeln(sprintf('<comment>ssh -v %s</comment>', escapeshellarg($gitSshUrl))); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.52.0/src/Model/Host/HostInterface.php new/platformsh-cli-3.52.1/src/Model/Host/HostInterface.php --- old/platformsh-cli-3.52.0/src/Model/Host/HostInterface.php 2020-01-24 22:46:43.000000000 +0100 +++ new/platformsh-cli-3.52.1/src/Model/Host/HostInterface.php 2020-01-29 12:29:32.000000000 +0100 @@ -20,9 +20,12 @@ public function getCacheKey(); /** + * Runs a command on the host. + * * @param string $command - * @param bool $mustRun - * @param bool $quiet + * @param bool $mustRun + * @param bool $quiet + * @param string|null $input * * @return string|true * The command's output, or true if it succeeds with no output, or false @@ -31,7 +34,7 @@ * @throws \Symfony\Component\Process\Exception\RuntimeException * If $mustRun is enabled and the command fails. */ - public function runCommand($command, $mustRun = true, $quiet = true); + public function runCommand($command, $mustRun = true, $quiet = true, $input = null); /** * Runs a command using the current STDIN, STDOUT and STDERR. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.52.0/src/Model/Host/LocalHost.php new/platformsh-cli-3.52.1/src/Model/Host/LocalHost.php --- old/platformsh-cli-3.52.0/src/Model/Host/LocalHost.php 2020-01-24 22:46:43.000000000 +0100 +++ new/platformsh-cli-3.52.1/src/Model/Host/LocalHost.php 2020-01-29 12:29:32.000000000 +0100 @@ -60,9 +60,9 @@ /** * {@inheritDoc} */ - public function runCommand($command, $mustRun = true, $quiet = true) + public function runCommand($command, $mustRun = true, $quiet = true, $input = null) { - return $this->shell->execute($command, null, $mustRun, $quiet); + return $this->shell->execute($command, null, $mustRun, $quiet, [], 3600, $input); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.52.0/src/Model/Host/RemoteHost.php new/platformsh-cli-3.52.1/src/Model/Host/RemoteHost.php --- old/platformsh-cli-3.52.0/src/Model/Host/RemoteHost.php 2020-01-24 22:46:43.000000000 +0100 +++ new/platformsh-cli-3.52.1/src/Model/Host/RemoteHost.php 2020-01-29 12:29:32.000000000 +0100 @@ -39,9 +39,9 @@ /** * {@inheritDoc} */ - public function runCommand($command, $mustRun = true, $quiet = true) + public function runCommand($command, $mustRun = true, $quiet = true, $input = null) { - return $this->shell->execute($this->wrapCommandLine($command), null, $mustRun, $quiet); + return $this->shell->execute($this->wrapCommandLine($command), null, $mustRun, $quiet, [], 3600, $input); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.52.0/src/Service/Shell.php new/platformsh-cli-3.52.1/src/Service/Shell.php --- old/platformsh-cli-3.52.0/src/Service/Shell.php 2020-01-24 22:46:43.000000000 +0100 +++ new/platformsh-cli-3.52.1/src/Service/Shell.php 2020-01-29 12:29:32.000000000 +0100 @@ -76,6 +76,7 @@ * @param bool $quiet * @param array $env * @param int|null $timeout + * @param string|null $input * * @throws \Symfony\Component\Process\Exception\RuntimeException * If $mustRun is enabled and the command fails. @@ -84,9 +85,9 @@ * False if the command fails, true if it succeeds with no output, or a * string if it succeeds with output. */ - public function execute($args, $dir = null, $mustRun = false, $quiet = true, array $env = [], $timeout = 3600) + public function execute($args, $dir = null, $mustRun = false, $quiet = true, array $env = [], $timeout = 3600, $input = null) { - $process = new Process($args, null, null, null, $timeout); + $process = new Process($args, null, null, $input, $timeout); // Avoid adding 'exec' to every command. It is not needed in this // context as we do not need to send signals to the process. Also it @@ -104,6 +105,10 @@ OutputInterface::VERBOSITY_VERBOSE ); + if (!empty($input) && is_string($input)) { + $this->stdErr->writeln(sprintf(' Command input: <info>%s</info>', $input), OutputInterface::VERBOSITY_VERBOSE); + } + if (!empty($env)) { $this->showEnvMessage($env); $process->setEnv($env + $this->getParentEnv()); @@ -114,6 +119,9 @@ $this->showWorkingDirMessage($dir); } + // Blank line just to aid debugging. + $this->stdErr->writeln('', OutputInterface::VERBOSITY_VERBOSE); + $result = $this->runProcess($process, $mustRun, $quiet); return is_int($result) ? $result === 0 : $result; ++++++ platformsh-cli-vendor.tar.xz ++++++ ++++ 2297 lines of diff (skipped)

1 0

commit openSUSE-release-tools for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Leap:15.2 checked in at 2020-01-30 15:47:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Leap:15.2/.openSUSE-release-tools.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-release-tools" Thu Jan 30 15:47:11 2020 rev:293 rq:768514 version:20200129.7a3a7a36 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/openSUSE-release-tools/openSUSE-release-tools.changes 2020-01-30 06:09:34.154503587 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.openSUSE-release-tools.new.26092/openSUSE-release-tools.changes 2020-01-30 15:47:36.821303337 +0100 @@ -1,0 +2,12 @@ +Wed Jan 29 16:41:27 UTC 2020 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20200129.7a3a7a36: + * Use The openSUSE release team email for announcer + +------------------------------------------------------------------- +Wed Jan 29 09:55:00 UTC 2020 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20200129.fce860f3: + * Actually subscribe to the repo.build_finished event + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20200128.8bd11b00.obscpio New: ---- openSUSE-release-tools-20200129.7a3a7a36.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.iCSXn4/_old 2020-01-30 15:47:37.545303555 +0100 +++ /var/tmp/diff_new_pack.iCSXn4/_new 2020-01-30 15:47:37.553303558 +0100 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20200128.8bd11b00 +Version: 20200129.7a3a7a36 Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0-or-later AND MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.iCSXn4/_old 2020-01-30 15:47:37.601303573 +0100 +++ /var/tmp/diff_new_pack.iCSXn4/_new 2020-01-30 15:47:37.601303573 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">8bd11b00608efcf5717b283d07283443b3ab456a</param> + <param name="changesrevision">7a3a7a368079b057f67274681f99f8950d71a962</param> </service> </servicedata> ++++++ openSUSE-release-tools-20200128.8bd11b00.obscpio -> openSUSE-release-tools-20200129.7a3a7a36.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20200128.8bd11b00/config/announcer/openSUSE:Leap:15.2.yml new/openSUSE-release-tools-20200129.7a3a7a36/config/announcer/openSUSE:Leap:15.2.yml --- old/openSUSE-release-tools-20200128.8bd11b00/config/announcer/openSUSE:Leap:15.2.yml 2020-01-28 13:06:55.000000000 +0100 +++ new/openSUSE-release-tools-20200129.7a3a7a36/config/announcer/openSUSE:Leap:15.2.yml 2020-01-29 17:40:56.000000000 +0100 @@ -30,4 +30,4 @@ name: openSUSE:Leap:15.2 subject: Leap 15.2 Build {version} released! url: http://download.opensuse.org/distribution/leap/15.2/iso/ -sender: Ludwig Nussel <ludwig.nussel(a)suse.de> +sender: openSUSE release team <opensuse-releaseteam(a)opensuse.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20200128.8bd11b00/gocd/rabbit-openqa.py new/openSUSE-release-tools-20200129.7a3a7a36/gocd/rabbit-openqa.py --- old/openSUSE-release-tools-20200128.8bd11b00/gocd/rabbit-openqa.py 2020-01-28 13:06:55.000000000 +0100 +++ new/openSUSE-release-tools-20200129.7a3a7a36/gocd/rabbit-openqa.py 2020-01-29 17:40:56.000000000 +0100 @@ -166,7 +166,7 @@ def routing_keys(self): ret = [] - for suffix in ['.obs.repo.published', '.openqa.job.done', + for suffix in ['.obs.repo.published', '.obs.repo.build_finished', '.openqa.job.done', '.openqa.job.create', '.openqa.job.restart']: ret.append(self.amqp_prefix + suffix) return ret ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.iCSXn4/_old 2020-01-30 15:47:38.261303771 +0100 +++ /var/tmp/diff_new_pack.iCSXn4/_new 2020-01-30 15:47:38.261303771 +0100 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20200128.8bd11b00 -mtime: 1580213215 -commit: 8bd11b00608efcf5717b283d07283443b3ab456a +version: 20200129.7a3a7a36 +mtime: 1580316056 +commit: 7a3a7a368079b057f67274681f99f8950d71a962

1 0

commit virtualbox for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package virtualbox for openSUSE:Leap:15.2 checked in at 2020-01-30 15:47:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/virtualbox (Old) and /work/SRC/openSUSE:Leap:15.2/.virtualbox.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtualbox" Thu Jan 30 15:47:09 2020 rev:78 rq:768511 version:6.1.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/virtualbox/virtualbox.changes 2020-01-15 16:28:17.560749029 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.virtualbox.new.26092/virtualbox.changes 2020-01-30 15:47:31.941301869 +0100 @@ -1,0 +2,129 @@ +Fri Jan 17 22:56:58 UTC 2020 - Larry Finger <Larry.Finger(a)gmail.com> + +- Version update to 6.1.2 (released January 14 2020i by Oracle) + + 18 Vulnerabilities fixed: CVE-2020-2674 CVE-2020-2682 CVE-2020-2698 CVE-2020-2701 CVE-2020-2702 CVE-2020-2726 + CVE-2020-2681 CVE-2020-2689 CVE-2020-2690 CVE-2020-2691 CVE-2020-2692 CVE-2020-2703 + CVE-2020-2704 CVE-2020-2705 CVE-2020-2725 CVE-2020-2678 CVE-2020-2727 CVE-2020-2693 + See bsc#1161050 + File "fixes_for_leap15.2.patch" added to fix build for Leap 15.2. + File "vbox_fix_for_gcc7.patch" is deleted - fixed upstream. + File "fixes_for_5.4.patch" is deleted - fixed upstream. + Exclude 32-bit builds + Update so the openSUSE Leap 42.3 builds OK. + + As announced earlier by Oracle, 32-bit builds are no longer supported. + + This is a maintenance release. The following items were fixed and/or added: + + Virtualization core: fixed performance issue observed with Windows XP guests on AMD hosts (6.0.0 regression; bug #19152) + Virtualization core: consistent IBRS/IBPB CPUID feature reporting, avoids crash of NetBSD 9.0 RC1 installer (bug #19146) + GUI: fixed updating of runtime info + GUI: in Display settings, do not show "2D video acceleration" checkbox if it is meaningless for the selected graphics adapter + Audio: fixed audio input handling when VRDE is enabled + Audio: fixed crash in the HDA emulation when using multi-speaker configurations + Storage: fixed use of encrypted disks with snapshots involved (6.1.0 regression; bug #19160) + Storage: improve performance of virtio-scsi + Storage: read-only support for compressed clusters in QCOW2 images + Linux host: Support Linux 5.5 (guest additions not yet) + Windows guest: accelerate 2D video decoding (scaling and color space conversion) if the VM is configured to use VBoxSVGA with 3D enabled + Windows guest: fix guest additions installer to upgrade the mouse filter driver reliably + Windows guest: when uninstalling older Guest Additions with old 3D support enabled try restoring original Direct3D files + Linux guest: improve resize and multi-monitor handling for VMs using VMSVGA (known remaining issue: do not disable a monitor "in the middle", causes confusion) + +------------------------------------------------------------------- +Tue Dec 24 21:59:07 UTC 2019 - Larry Finger <Larry.Finger(a)gmail.com> + +- Version update to 6.1.0 (released December 10 2019 by Oracle) + - Fixes bsc#1132102. + - Removed file "set_graphics_type.patch" as the problem is fixed upstream. + + This is a major update. The following major new features were added: + + - Implemented support for importing a virtual machine from Oracle Cloud Infrastructure + - Extended support for exporting a virtual machine to Oracle Cloud Infrastructure, allowing the creation + of multiple virtual machines without re-uploading. Also added option to export a VM to the cloud using the more efficient + variant "paravirtialized", and to specify free-form tags for cloud images + - Virtualization core: Support for nested hardware-virtualization on Intel CPUs (starting with 5th generation Core i, + codename Broadwell), so far tested only with guest running VirtualBox + - Graphics: New style 3D support (with VBoxSVGA and VMSVGA) remains, old style 3D support (with VBoxVGA) has been completely removed + - Shared Clipboard: Implemented experimental support for file transfers (Windows hosts/guests only at the moment). + Needs to be enabled via VBoxManage (disabled by default). In addition, the following items were fixed and/or added: + + In addition, the following items were fixed and/or added: + + - Virtualization core: Drop recompiler, i.e. running VMs now needs a CPU supporting hardware virtualization + - Runtime: Works now on hosts with many CPUs (limit now 1024) + - Appliance and Cloud Import: Add field for defining firmware type (not part of OVF spec and thus manual in the Appliance case, + for OCI it is automatically taken from the instance information) + - GUI: Improved the VISO creation and file manager dialogs + - GUI: Virtual machine list of VirtualBox Manager was improved. Machine groups are now more obvious visually and VM + search functionality has been improved. Global Tools element can now be pinned in place, to avoid scrolling it with rest of machine list + - GUI: Virtual machine details pane is now extended with embedded editors for selected VM attributes, allowing user to edit them + on-the-fly byi clicking corresponding hyper-links without opening VM settings dialog + - GUI: Details pane provides more complete information + - GUI: Internal medium enumeration routines were optimized to reduce the load and optimize the performance in cases when + user have lots of media registered. Also, we again allowed to add existing media (and create new) via Virtual Media Manager + - GUI: More consistent medium selection (both showing known images and allowing to select using the file picker) + - GUI: VM storage settings page was adjusted a bit in usability regard. User is now allowed to change controller bus type + and can move attachments between the controllers by using drag and drop + - GUI: Storage and Network settings pages bug-fixes and usability optimization + - GUI: Added a new soft (virtual) keyboard enabling arbitrary keyboard input to guests, including multimedia keys + - GUI: Fixed crash in cloud related wizards when accessibility functionality was enabled + - GUI: Show VM CPU load as part of status bar CPU indicator + - GUI: Improved and extended the Session Information dialog + - GUI: Fixed/improved mouse pointer scaling + - GUI: Some issues related to mouse integration cursor scaling were addressed (bug #14366), more to go + - GUI: Fix and unify geometry save/restore in various dialogs + - GUI: Added the missing restriction options for disabling new functionality such as the VISO creator + - GUI: Popup messages mouse click fix + - Graphics: Remove 3D support for VBoxVGA (old one deprecated with 6.0) + - Graphics: Additional texture format support on Windows host + - Graphics: Improved fix for flickering on Windows host + - Input: Added support for horizontal scrolling in the PS/2 mouse device using the IntelliMouse Explorer protocol. + Note that this support is automatically used by Linux guests but not by Windows guests + - vboximg-mount: Experimental support for direct read-only access to NTFS, FAT and ext2/3/4 filesystems inside a disk + image without the need for support on the host + - vboximg-mount: Now also available on Linux host + - Storage: Experimental support for virtio-scsi, for both hard disks and optical drives (including boot support in BIOS) + - Storage: For optical drive emulation fix empty host drive crash + - USB: Improvements for EHCI controller implementation + - USB: Filter can now specify port path, uniquely identifying a port in a system + - NAT: Fix TFTP OACK response, send only if request has options + - NAT Network: Use non-blocking sockets on Linux for accepted incoming connections (port forwarding) + - PCnet-ISA: Added new network adapter type, currently CLI only + - Audio: Allow changing the host audio backend while the VM is in saved state + - ACPI: Report NVMe controller + - VGA: Improve hardware and BIOS compatibility + - VBoxSVGA/VMSVGA: Support YUV2 and related texture formats with hosts using OpenGL (macOS and Linux), + which accelerates video playback when 3D is enabled by delegating the color space conversion to the host GPU + - VBoxSVGA/VMSVGA: Several drawing fixes for the 3D case + - VMSVGA 3D: Fixed OpenGL compressed textures + - VBoxManage: More cloud functionality coverage, e.g. starting a cloud instance + - VBoxManage: As part of the guest control feature support moving multiple source files/directories to a target directory + - Guest Control/VBoxManage: Added support for specifying multiple sources when renaming guest files + - VBoxManage: Show "unrestricted guest" and "nested HW virtualization" CPU features when listing the host information + - API: Reduce the amount of leftovers from Move VM function + - Shared Clipboard: Implemented experimental support for file transfers for Linux hosts on Windows guests (disabled by default) + - SMBIOS: Store system UUID in little endian format which is the default for new VMs, while existing VMs stick to the old VirtualBox + behavior of storing them in big endian format for backwards compatibility to avoid breaking the activation status of Windows VMs + - VBoxSDL frontend: Fixed running on Windows hosts + - Linux host: Improve vboxweb systemd service dependency information + - Linux host: Drop PCI passthrough, the current code is too incomplete (cannot handle PCIe devices at all), i.e. not useful enough + - Linux host and guest: Support Linux 5.4 (bug #18945) + - Linux host and guest: Force disabling of kernel module signing during build (user can do it afterwards) + - Windows Guest Additions: Many fixes for drawing problems in the driver for VBoxSVGA + - Windows Guest Additions: Fixes for legacy VBoxVGA adapter, restore previously working cases + - Windows Guest Additions: Restore VHWA functionality for VBoxSVGA + - Windows guest: DXVA implementation for WDDM driver + - Documentation: Updated supported host operating systems, added few new manual pages (more to come later) + - EFI: Switch to newer firmware code base and add NVRAM support, should improve compatibility with OSes significantly + - EFI: Added support for booting from APFS + - EFI: Added support for non-standard SATA and NVMe boot device paths created by OS X + +Tue Dec 24 01:49:21 UTC 2019 - Larry Finger <Larry.Finger(a)gmail.com> + + - Turn build of vboxvideo back on just in case VB is used with an older kernel, + and make the necessary fixes for kernel v5.5. + +------------------------------------------------------------------- Old: ---- VirtualBox-6.0.14-patched.tar.bz2 fixes_for_5.4.patch set_graphics_type.patch vbox_fix_for_gcc7.patch New: ---- VirtualBox-6.1.2-patched.tar.bz2 fixes_for_leap15.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.149303135 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.157303137 +0100 @@ -1,7 +1,7 @@ # # spec file for package virtualbox # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,8 +46,8 @@ %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir /usr/lib/udev/rules.d Name: virtualbox -# ********* If the VB version exceeds 6.0.x, notify the libvirt maintainer!! -Version: 6.0.14 +# ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!! +Version: 6.1.2 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0-or-later @@ -98,8 +98,6 @@ #fix failed linking process during build - this patch is just quick workaround Patch10: vbox-gsoapssl-deps.diff #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user -# Set graphics adapter type to VBoxVGA boo#1151896 -Patch98: set_graphics_type.patch #try to start VirtualBox and is not member of vboxusers group Patch99: vbox-permissions_warning.diff #PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes build-compare happier @@ -129,8 +127,6 @@ Patch112: modify_for_4_8_bo_move.patch # Remove all mention of _smp_mflags Patch113: vbox_remove_smp_mflags.patch -# Allow use of gcc7 -Patch115: vbox_fix_for_gcc7.patch # Fix for missing include needed for server 1.19 Patch116: Fix_for_server_1.19.patch # Fix invalid use of internal headers @@ -149,14 +145,12 @@ Patch130: fixes_for_Leap42.3.patch # Fixes for Qt5.13 on 32-bit systems Patch132: fixes_for_qt5.13.patch -#endif -# Fixes for API changes in kernel 5.4 -Patch133: fixes_for_5.4.patch +# Fixes for openSUSE Leap 15.2 +Patch133: fixes_for_leap15.2.patch # Fixes for API changes in kernel 5.5 Patch134: fixes_for_5.5.patch Patch999: virtualbox-fix-ui-background-color.patch # -BuildRequires: %{python_module devel} BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel BuildRequires: acpica @@ -181,7 +175,7 @@ BuildRequires: gsoap-devel >= 2.8.50 BuildRequires: java-devel >= 1.6.0 BuildRequires: kbuild >= 0.1.9998svn3101 -BuildRequires: kernel-syms +#BuildRequires: kernel-syms BuildRequires: libcap-devel BuildRequires: libcurl-devel BuildRequires: libelf-devel @@ -217,7 +211,6 @@ BuildRequires: pkgconfig(xau) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcursor) -BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xdmcp) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xextproto) @@ -242,7 +235,7 @@ Obsoletes: %{name}-ose < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template) -ExclusiveArch: %ix86 x86_64 +ExclusiveArch: x86_64 %ifarch amd64 x86_64 ia32e em64t BuildRequires: gcc-32bit BuildRequires: gcc-c++-32bit @@ -425,7 +418,6 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch98 -p1 %patch99 -p1 %patch100 -p1 %patch101 -p1 @@ -441,7 +433,6 @@ %patch111 -p1 %patch112 -p1 %patch113 -p1 -%patch115 -p1 %patch116 -p1 %patch118 -p1 %patch120 -p1 @@ -449,7 +440,6 @@ %patch123 -p1 %patch125 -p1 %patch128 -p1 -echo "sle_version " %{?sle_version}", is_opensuse " %{?is_opensuse}", suse_version " %{?suse_version} # Adjustments that are version dependent %if 0%{?sle_version} == 120300 && 0%{?is_opensuse} # Patch for Leap 42.3 @@ -464,7 +454,6 @@ # make VB UI background colors look sane again %patch999 -p1 -echo "sle_version $(0%{?sle_version})" #copy user manual cp %{SOURCE1} UserManual.pdf @@ -544,12 +533,11 @@ # # build kernel modules for guest and host (check novel-kmp package as example) -# host modules : vboxdrv,vboxnetflt,vboxnetadp,vboxpci +# host modules : vboxdrv,vboxnetflt,vboxnetadp # guest modules : vboxguest,vboxsf vboxvideo (for Leap 15.1 and older) echo "build kernel modules" -#%if 0%{?suse_version} < 1550 -for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \ - out/linux.*/release/bin/additions/src/vbox{guest,sf}; do +for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp} \ + out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do #get the module name from path module_name=$(basename "$vbox_module") @@ -570,8 +558,7 @@ # copy vboxdrv (for host) module symbols which are used by vboxnetflt and vboxnetadp km's: if [ "$module_name" = "vboxnetflt" -o \ - "$module_name" = "vboxnetadp" -o \ - "$module_name" = "vboxpci" ] ; then + "$module_name" = "vboxnetadp" ] ; then cp $PWD/modules_build_dir/$flavor/vboxdrv/Module.symvers \ $PWD/modules_build_dir/$flavor/$module_name SYMBOLS="$PWD/modules_build_dir/$flavor/vboxdrv/Module.symvers" @@ -599,9 +586,6 @@ install -d -m 755 %{buildroot}%{_sbindir} install -d -m 755 %{buildroot}%{_datadir}/virtualbox/nls install -d -m 755 %{buildroot}%{_datadir}/pixmaps -%if 0%{?sle_version} != 120300 -install -d -m 755 %{buildroot}%{_datadir}/metainfo -%endif install -d -m 755 %{buildroot}%{_datadir}/applications install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom install -d -m 755 %{buildroot}%{_vbox_instdir}/components @@ -625,11 +609,7 @@ export INITRD_IN_POSTTRANS=1 export KMP_NEEDS_MKINITRD=0 #to install modules we use here similar steps like in build phase, go through all the modules : -#%if 0%{?suse_version} < 1550 -for module_name in vbox{drv,netflt,pci,netadp,guest,sf,video} -#%else -#for module_name in vbox{drv,netflt,pci,netadp,guest,sf} -#%endif +for module_name in vbox{drv,netflt,netadp,guest,sf,video} do #and through the all flavors for flavor in %{flavors_to_build}; do @@ -658,12 +638,6 @@ #VBoxClient daemon (support for clipboard,autoresize,seamless windows) install -m 755 VBoxClient %{buildroot}%{_bindir} popd -# VBoxOGL* libs for guest-x11 subpackage -install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \ - %{buildroot}%{_libdir} -# VBoxEGL* libs for guest-x11 subpackage -install -m 755 out/linux.*/release/bin/additions/VBoxEGL*.so \ - %{buildroot}%{_libdir} # install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows) install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh @@ -684,7 +658,8 @@ install -m 755 webtest %{buildroot}%{_vbox_instdir} install -m 755 VBoxDTrace %{buildroot}%{_vbox_instdir} install -m 755 VBoxDbg.so %{buildroot}%{_vbox_instdir} -install -m 755 VBoxSDL.so %{buildroot}%{_vbox_instdir} +install -m 755 VBoxDbg.so %{buildroot}%{_vbox_instdir} +install -m 755 UICommon.so %{buildroot}%{_vbox_instdir} # create links to vbox tools in PATH - they could be usefull for controlling vbox from command line ln -s %{_vbox_instdir}/VBoxManage %{buildroot}%{_bindir}/VBoxManage ln -s %{_vbox_instdir}/VBoxHeadless %{buildroot}%{_bindir}/VBoxHeadless @@ -706,8 +681,8 @@ install -m 755 VBoxEFI*.fd %{buildroot}%{_vbox_instdir} install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir} install -m 644 *.so %{buildroot}%{_vbox_instdir} -install -m 644 *.rc %{buildroot}%{_vbox_instdir} install -m 644 *.r0 %{buildroot}%{_vbox_instdir} +rm components/VBoxREM.so install -m 644 components/* %{buildroot}%{_vbox_instdir}/components/ # install languages install -m 644 nls/* %{buildroot}%{_datadir}/virtualbox/nls/ @@ -730,7 +705,6 @@ %endif # create a menu entry -mkdir -p %{buildroot}%{_datadir}/pixmaps install -m 644 out/linux.*/release/bin/VBox.png %{buildroot}%{_datadir}/pixmaps/virtualbox.png # install config with session shutdown defs install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/default/virtualbox @@ -964,14 +938,11 @@ %{_vbox_instdir}/VBoxHeadless.so %{_vbox_instdir}/VBoxNetDHCP.so %{_vbox_instdir}/VBoxNetNAT.so -%{_vbox_instdir}/VBoxREM*.so %{_vbox_instdir}/VBoxRT.so %{_vbox_instdir}/VBoxSharedFolders.so %{_vbox_instdir}/VBoxVMM.so %{_vbox_instdir}/VBoxXPCOMC.so %{_vbox_instdir}/VBoxXPCOM.so -%{_vbox_instdir}/VBoxDDRC.rc -%{_vbox_instdir}/VMMRC.rc %{_vbox_instdir}/VBox*.r0 %{_vbox_instdir}/VMMR0.r0 %{_vbox_instdir}/VBoxEFI*.fd @@ -986,6 +957,7 @@ %{_vbox_instdir}/VBoxDragAndDropSvc.so %{_vbox_instdir}/VBoxVMMPreload.so #todo:double check - if this file should be assigned to the host side +%{_vbox_instdir}/UICommon.so %{_vbox_instdir}/VBoxHostChannel.so %dir %{_vbox_instdir}/components %{_vbox_instdir}/components/*.so @@ -1005,10 +977,10 @@ %{_sbindir}/rcvboxautostart /sbin/vboxconfig %{_vbox_instdir}/VBoxCreateUSBNode.sh -%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT -%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP -%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl -%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxHeadless +%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT +%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP +%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl +%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxHeadless %dir %{_sysconfdir}/vbox %attr(1775,root,vboxusers) %{_sysconfdir}/vbox %config %attr(644,root,vboxusers) %{_sysconfdir}/vbox/vbox.cfg @@ -1020,8 +992,8 @@ %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSUIDMessage %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxUSB_DevRules %attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBox6 -%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM -%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxSDL +%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM +%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL %{_vbox_instdir}/VirtualBox #wrapper script is in bindir %attr(0755,root,root) %{_bindir}/VirtualBox @@ -1031,13 +1003,11 @@ %{_vbox_instdir}/VBoxTestOGL #qm's translations %{_datadir}/virtualbox/nls -%{_vbox_instdir}/VBoxGlobal.so %{_vbox_instdir}/VBoxSVGA3D.so %{_vbox_instdir}/VirtualBoxVM.so %{_vbox_instdir}/VBoxDbg.so %{_bindir}/VBoxSDL %{_vbox_instdir}/VBoxSDL.so -%{_vbox_instdir}/VBoxSharedCrOpenGL.so %{_vbox_instdir}/VBoxKeyboard.so %{_vbox_instdir}/VBoxSharedClipboard.so %{_datadir}/pixmaps/virtualbox.png @@ -1053,8 +1023,6 @@ %dir %{_libdir}/xorg/modules/input %dir %{_libdir}/dri/ %{_bindir}/VBoxClient -%{_libdir}/VBoxOGL*.so -%{_libdir}/VBoxEGL*.so %{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh %files guest-tools ++++++ UserManual.pdf ++++++ (binary differes) ++++++ VirtualBox-6.0.14-patched.tar.bz2 -> VirtualBox-6.1.2-patched.tar.bz2 ++++++ /work/SRC/openSUSE:Leap:15.2/virtualbox/VirtualBox-6.0.14-patched.tar.bz2 /work/SRC/openSUSE:Leap:15.2/.virtualbox.new.26092/VirtualBox-6.1.2-patched.tar.bz2 differ: char 11, line 1 ++++++ fix_lib_search.patch ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.229303160 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.229303160 +0100 @@ -19,23 +19,3 @@ if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal && test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then foundqt5=1 # no pkg-config, Qt directory -Index: VirtualBox-6.0.12/src/VBox/Additions/common/crOpenGL/Makefile.kmk -=================================================================== ---- VirtualBox-6.0.12.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk -+++ VirtualBox-6.0.12/src/VBox/Additions/common/crOpenGL/Makefile.kmk -@@ -224,15 +224,7 @@ VBoxOGL_LIBS.win += \ - $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB) - - if1of ($(KBUILD_TARGET), linux solaris freebsd) -- ifdef VBOX_USE_SYSTEM_GL_HEADERS - VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext -- else -- VBoxOGL_LIBS += \ -- $(PATH_STAGE_LIB)/libXcomposite.so \ -- $(PATH_STAGE_LIB)/libXdamage.so \ -- $(PATH_STAGE_LIB)/libXfixes.so \ -- $(PATH_STAGE_LIB)/libXext.so -- endif - ifdef VBoxOGL_FAKEDRI - ifeq ($(KBUILD_TARGET), freebsd) - VBoxOGL_LIBS += \ ++++++ fixes_for_5.5.patch ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.237303162 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.237303162 +0100 @@ -1,17 +1,33 @@ -Index: VirtualBox-6.0.14/src/VBox/HostDrivers/linux/Makefile +Index: VirtualBox-6.1.2/src/VBox/HostDrivers/linux/Makefile =================================================================== ---- VirtualBox-6.0.14.orig/src/VBox/HostDrivers/linux/Makefile -+++ VirtualBox-6.0.14/src/VBox/HostDrivers/linux/Makefile -@@ -45,6 +45,8 @@ else # ! KERNELRELEASE +--- VirtualBox-6.1.2.orig/src/VBox/HostDrivers/linux/Makefile ++++ VirtualBox-6.1.2/src/VBox/HostDrivers/linux/Makefile +@@ -35,9 +35,6 @@ endif + ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),) + obj-m += vboxnetadp/ + endif +-ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),) +- obj-m += vboxpci/ +-endif + + else # ! KERNELRELEASE + +@@ -45,10 +42,11 @@ else # ! KERNELRELEASE KBUILD_VERBOSE ?= KERN_VER ?= $(shell uname -r) +-.PHONY: all install clean check unload load vboxdrv vboxnetflt vboxnetadp \ +- vboxpci +PWD ?= $(shell pwd) + - .PHONY: all install clean check unload load vboxdrv vboxnetflt vboxnetadp \ - vboxpci ++.PHONY: all install clean check unload load vboxdrv vboxnetflt vboxnetadp + +-all: vboxdrv vboxnetflt vboxnetadp vboxpci ++all: vboxdrv vboxnetflt vboxnetadp -@@ -64,6 +66,7 @@ vboxnetflt: vboxdrv + # We want to build on Linux 2.6.18 and later kernels. + ifneq ($(filter-out 1.% 2.0.% 2.1.% 2.2.% 2.3.% 2.4.% 2.5.%,$(KERN_VER)),) +@@ -64,6 +62,7 @@ vboxnetflt: vboxdrv if [ -f vboxdrv/Module.symvers ]; then \ cp vboxdrv/Module.symvers vboxnetflt; \ fi; \ @@ -19,7 +35,7 @@ echo "=== Building 'vboxnetflt' module ==="; \ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt || exit 1; \ cp vboxnetflt/vboxnetflt.ko .; \ -@@ -75,8 +78,9 @@ vboxnetadp: vboxdrv +@@ -75,41 +74,29 @@ vboxnetadp: vboxdrv if [ -f vboxdrv/Module.symvers ]; then \ cp vboxdrv/Module.symvers vboxnetadp; \ fi; \ @@ -30,15 +46,18 @@ cp vboxnetadp/vboxnetadp.ko .; \ echo; \ fi -@@ -86,6 +90,7 @@ vboxpci: vboxdrv - if [ -f vboxdrv/Module.symvers ]; then \ - cp vboxdrv/Module.symvers vboxpci; \ - fi; \ -+ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxpci/Module.symvers; \ - echo "=== Building 'vboxpci' module ==="; \ - $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci || exit 1; \ - cp vboxpci/vboxpci.ko .; \ -@@ -95,12 +100,15 @@ vboxpci: vboxdrv + +-vboxpci: vboxdrv +- @if [ -d vboxpci ]; then \ +- if [ -f vboxdrv/Module.symvers ]; then \ +- cp vboxdrv/Module.symvers vboxpci; \ +- fi; \ +- echo "=== Building 'vboxpci' module ==="; \ +- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci || exit 1; \ +- cp vboxpci/vboxpci.ko .; \ +- echo; \ +- fi +- install: @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv install @if [ -d vboxnetflt ]; then \ @@ -49,8 +68,237 @@ + export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetadp/Module.symvers; \ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp install; \ fi - @if [ -d vboxpci ]; then \ -+ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxpci/Module.symvers; \ - $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci install; \ +- @if [ -d vboxpci ]; then \ +- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci install; \ +- fi + + else + + vboxdrv: + vboxnetflt: + vboxnetadp: +-vboxpci: + install: + + endif +@@ -122,16 +109,13 @@ clean: + @if [ -d vboxnetadp ]; then \ + $(MAKE) -C vboxnetadp clean; \ fi +- @if [ -d vboxpci ]; then \ +- $(MAKE) -C vboxpci clean; \ +- fi +- rm -f vboxdrv.ko vboxnetflt.ko vboxnetadp.ko vboxpci.ko ++ rm -f vboxdrv.ko vboxnetflt.ko vboxnetadp.ko + + check: + @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv check + + unload: +- @for module in vboxpci vboxnetadp vboxnetflt vboxdrv; do \ ++ @for module in vboxnetadp vboxnetflt vboxdrv; do \ + if grep "^$$module " /proc/modules >/dev/null; then \ + echo "Removing previously installed $$module module"; \ + /sbin/rmmod $$module; \ +@@ -139,7 +123,7 @@ unload: + done + + load: unload +- @for module in vboxdrv vboxnetflt vboxnetadp vboxpci; do \ ++ @for module in vboxdrv vboxnetflt vboxnetadp; do \ + if test -f $$module.ko; then \ + echo "Installing $$module module"; \ + /sbin/insmod $$module.ko; \ +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/Makefile +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/Makefile ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/Makefile +@@ -24,6 +24,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/ + else # ! KERNELRELEASE + + KBUILD_VERBOSE = ++PWD ?= $(shell pwd) + ifeq ($(KBUILD_VERBOSE),) + VBOX_QUIET := @ + VBOX_QUIET_SH := @ +@@ -49,6 +50,7 @@ vboxsf: vboxguest + if [ -f vboxguest/Module.symvers ]; then \ + cp vboxguest/Module.symvers vboxsf; \ + fi; \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxsf/Module.symvers; \ + echo "=== Building 'vboxsf' module ==="; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxsf/Module.symvers) -C vboxsf || exit 1; \ + if [ -f vboxsf/vboxsf.ko ]; then \ +@@ -64,6 +66,7 @@ vboxvideo: + if [ -f vboxguest/Module.symvers ]; then \ + cp vboxguest/Module.symvers vboxvideo; \ + fi; \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxvideo/Module.symvers; \ + echo "=== Building 'vboxvideo' module ==="; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxvideo/Module.symvers) -C vboxvideo || exit 1; \ + if [ -f vboxvideo/vboxvideo.ko ]; then \ +@@ -77,9 +80,11 @@ vboxvideo: + install: + $(VBOX_QUIET)$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest install + $(VBOX_QUIET_SH)if [ -d vboxsf ]; then \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxsf/Module.symvers; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxsf install; \ + fi + $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \ ++ export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxvideo/Module.symvers; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \ + fi + +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.c +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.c +@@ -35,8 +35,18 @@ + #include <linux/module.h> + #include <linux/console.h> + #include <linux/vt_kern.h> ++#include <linux/version.h> + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) ++#include <drm/drm_file.h> ++#include <drm/drm_drv.h> ++#include <drm/drm_device.h> ++#include <linux/pci.h> ++#include <drm/drm_ioctl.h> ++#include <drm/drm_pci.h> ++#else + #include <drm/drmP.h> ++#endif + #include <drm/drm_crtc_helper.h> + + #include "vbox_drv.h" +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.h +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_drv.h +@@ -103,7 +103,13 @@ + #define S64_MIN ((s64)(-S64_MAX - 1)) + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) ++#include <drm/drm_file.h> ++#include <drm/drm_drv.h> ++#include <drm/drm_device.h> ++#else + #include <drm/drmP.h> ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75) + #include <drm/drm_encoder.h> + #endif +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_fb.c +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_fb.c ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_fb.c +@@ -42,7 +42,19 @@ + #include <linux/fb.h> + #include <linux/init.h> + ++#include <linux/version.h> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) ++#include <drm/drm_file.h> ++#include <drm/drm_drv.h> ++#include <drm/drm_device.h> ++#include <linux/pci.h> ++#include <drm/drm_fourcc.h> ++#include <drm/drm_pci.h> ++#include <drm/drm_ioctl.h> ++#define drm_compat_ioctl NULL ++#else + #include <drm/drmP.h> ++#endif + #include <drm/drm_crtc.h> + #include <drm/drm_fb_helper.h> + #include <drm/drm_crtc_helper.h> +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_mode.c ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c +@@ -45,6 +45,14 @@ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) || defined(RHEL_81) + #include <drm/drm_probe_helper.h> + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) ++#include <drm/drm_fourcc.h> ++#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++#include <drm/drm_vblank.h> ++#else ++#include <drm/drmP.h> ++#endif + + #include "VBoxVideo.h" + +@@ -398,6 +406,13 @@ static struct drm_encoder *drm_encoder_f + static struct drm_encoder *vbox_best_single_encoder(struct drm_connector + *connector) + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) ++ struct drm_encoder *encoder; ++ ++ /* There is only one encoder per connector */ ++ drm_connector_for_each_possible_encoder(connector, encoder) ++ return encoder; ++#else + int enc_id = connector->encoder_ids[0]; + + /* pick the encoder ids */ +@@ -410,6 +425,7 @@ static struct drm_encoder *vbox_best_sin + #else + return drm_encoder_find(connector->dev, enc_id); + #endif ++#endif + + return NULL; + } +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_ttm.c +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_ttm.c +@@ -34,6 +34,10 @@ + */ + #include "vbox_drv.h" + #include <drm/ttm/ttm_page_alloc.h> ++#include <linux/pci.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) ++#include <drm/drm_fourcc.h> ++#endif + + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72) + #define PLACEMENT_FLAGS(placement) (placement) +@@ -310,11 +314,12 @@ int vbox_mm_init(struct vbox_private *vb + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) || defined(RHEL_71) + dev->anon_inode->i_mapping, + #endif +-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) +- DRM_FILE_PAGE_OFFSET, true); +-#else +- true); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) ++ bdev->vma_manager, ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) ++ DRM_FILE_PAGE_OFFSET, + #endif ++ true); + if (ret) { + DRM_ERROR("Error initialising bo driver; %d\n", ret); + #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81) +Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_irq.c +=================================================================== +--- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_irq.c ++++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_irq.c +@@ -42,6 +42,10 @@ + #include <drm/drm_probe_helper.h> + #endif + #include <VBoxVideo.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) ++#include <drm/drm_irq.h> ++#include <linux/pci.h> ++#endif + static void vbox_clear_irq(void) + { ++++++ fixes_for_leap15.2.patch ++++++ Index: VirtualBox-6.1.0_RC1/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c =================================================================== --- VirtualBox-6.1.0_RC1.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ VirtualBox-6.1.0_RC1/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c @@ -73,6 +73,10 @@ #define VBOXNETFLT_OS_SPECFIC 1 #include "../VBoxNetFltInternal.h" +# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 2 +# define OPENSUSE_152 +# endif + typedef struct VBOXNETFLTNOTIFIER { struct notifier_block Notifier; PVBOXNETFLTINS pThis; @@ -924,13 +928,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++) { skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i]; -# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) +# if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) || defined(OPENSUSE_152) pSG->aSegs[iSeg].cb = pFrag->bv_len; pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; -# else /* < KERNEL_VERSION(5, 4, 0) */ +# else /* < KERNEL_VERSION(5, 4, 0) */ pSG->aSegs[iSeg].cb = pFrag->size; pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset; -# endif /* >= KERNEL_VERSION(5, 4, 0) */ +# endif /* >= KERNEL_VERSION(5, 4, 0) */ Log6((" %p", pSG->aSegs[iSeg].pv)); pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS; Assert(iSeg <= pSG->cSegsAlloc); @@ -945,13 +949,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++) { skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i]; -# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) +# if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) || defined(OPENSUSE_152) pSG->aSegs[iSeg].cb = pFrag->bv_len; pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; -# else /* < KERNEL_VERSION(5, 4, 0) */ +# else /* < KERNEL_VERSION(5, 4, 0) */ pSG->aSegs[iSeg].cb = pFrag->size; pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset; -# endif /* >= KERNEL_VERSION(5, 4, 0) */ +# endif /* >= KERNEL_VERSION(5, 4, 0) */ Log6((" %p", pSG->aSegs[iSeg].pv)); pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS; Assert(iSeg <= pSG->cSegsAlloc); Index: VirtualBox-6.1.0_RC1/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== --- VirtualBox-6.1.0_RC1.orig/src/VBox/Additions/linux/drm/vbox_drv.c +++ VirtualBox-6.1.0_RC1/src/VBox/Additions/linux/drm/vbox_drv.c @@ -307,11 +307,13 @@ static void vbox_master_drop(struct drm_ static struct drm_driver driver = { #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) .driver_features = - DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) + DRIVER_PRIME | +#endif # if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81) DRIVER_IRQ_SHARED | # endif /* < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81) */ - DRIVER_PRIME, + DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ, #else /* >= KERNEL_VERSION(5, 4, 0) */ .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ, #endif /* < KERNEL_VERSION(5, 4, 0) */ Index: VirtualBox-6.1.0_RC1/src/VBox/Additions/linux/drm/vbox_main.c =================================================================== --- VirtualBox-6.1.0_RC1.orig/src/VBox/Additions/linux/drm/vbox_main.c +++ VirtualBox-6.1.0_RC1/src/VBox/Additions/linux/drm/vbox_main.c @@ -626,8 +626,12 @@ static inline u64 vbox_bo_mmap_offset(st #elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_70) return bo->bo.addr_space_offset; #else +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) + return drm_vma_node_offset_addr(&bo->bo.base.vma_node); +#else return drm_vma_node_offset_addr(&bo->bo.vma_node); #endif /* >= KERNEL_VERSION(5, 4, 0) */ +#endif } int Index: VirtualBox-6.1.0_RC1/include/iprt/cdefs.h =================================================================== --- VirtualBox-6.1.0_RC1.orig/include/iprt/cdefs.h +++ VirtualBox-6.1.0_RC1/include/iprt/cdefs.h @@ -1173,14 +1173,15 @@ * Tell the compiler that we're falling through to the next case in a switch. * @sa RT_FALL_THRU */ #if RT_GNUC_PREREQ(7, 0) -# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) +# define FALL_THROUGH __attribute__((__fallthrough__)) #else -# define RT_FALL_THROUGH() (void)0 +# define FALL_THROUGH (void)0 #endif /** @def RT_FALL_THRU * Tell the compiler that we're falling thru to the next case in a switch. * @sa RT_FALL_THROUGH */ -#define RT_FALL_THRU() RT_FALL_THROUGH() +#define RT_FALL_THRU() FALL_THROUGH +#define RT_FALL_THROUGH() FALL_THROUGH /** @def RT_IPRT_FORMAT_ATTR ++++++ fixes_for_qt5.13.patch ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.253303167 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.253303167 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.0.6/include/VBox/VBoxGL2D.h +Index: VirtualBox-6.1.2/include/VBox/VBoxGL2D.h =================================================================== ---- VirtualBox-6.0.6.orig/include/VBox/VBoxGL2D.h -+++ VirtualBox-6.0.6/include/VBox/VBoxGL2D.h +--- VirtualBox-6.1.2.orig/include/VBox/VBoxGL2D.h ++++ VirtualBox-6.1.2/include/VBox/VBoxGL2D.h @@ -113,7 +113,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN /* GL_ARB_pixel_buffer_object*/ #ifndef Q_WS_MAC @@ -11,25 +11,10 @@ #endif #ifndef GL_READ_ONLY -Index: VirtualBox-6.0.6/include/VBox/HostServices/glext.h +Index: VirtualBox-6.1.2/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h =================================================================== ---- VirtualBox-6.0.6.orig/include/VBox/HostServices/glext.h -+++ VirtualBox-6.0.6/include/VBox/HostServices/glext.h -@@ -3395,7 +3395,10 @@ typedef char GLchar; /* native charact - #ifndef GL_VERSION_1_5 - /* GL types for handling large vertex buffer objects */ - typedef ptrdiff_t GLintptr; -+#if __BITS_PER_LONG != 64 - typedef ptrdiff_t GLsizeiptr; -+#else -+typedef long int GLsizeiptr; - #endif - - #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.6/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h -=================================================================== ---- VirtualBox-6.0.6.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h -+++ VirtualBox-6.0.6/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +--- VirtualBox-6.1.2.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h ++++ VirtualBox-6.1.2/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h @@ -465,7 +465,12 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 @@ -43,10 +28,10 @@ typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +Index: VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h =================================================================== ---- VirtualBox-6.0.6.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h -+++ VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +--- VirtualBox-6.1.2.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h ++++ VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h @@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 @@ -59,10 +44,10 @@ typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +Index: VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h =================================================================== ---- VirtualBox-6.0.6.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h -+++ VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +--- VirtualBox-6.1.2.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h ++++ VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h @@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 @@ -75,10 +60,10 @@ typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +Index: VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h =================================================================== ---- VirtualBox-6.0.6.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h -+++ VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +--- VirtualBox-6.1.2.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h ++++ VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h @@ -3708,7 +3708,11 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ @@ -91,10 +76,10 @@ #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.6/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +Index: VirtualBox-6.1.2/src/VBox/Devices/Graphics/vmsvga_glext/glext.h =================================================================== ---- VirtualBox-6.0.6.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h -+++ VirtualBox-6.0.6/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +--- VirtualBox-6.1.2.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h ++++ VirtualBox-6.1.2/src/VBox/Devices/Graphics/vmsvga_glext/glext.h @@ -6194,7 +6194,11 @@ typedef char GLchar; #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ @@ -107,36 +92,3 @@ #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/GL/glext.h -=================================================================== ---- VirtualBox-6.0.6.orig/src/VBox/GuestHost/OpenGL/include/GL/glext.h -+++ VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/GL/glext.h -@@ -3717,7 +3717,11 @@ typedef char GLchar; /* native charact - #ifndef GL_VERSION_1_5 - /* GL types for handling large vertex buffer objects */ - typedef ptrdiff_t GLintptr; -+#if __BITS_PER_LONG != 64 - typedef ptrdiff_t GLsizeiptr; -+#else -+typedef long int GLsizeiptr; -+#endif - #endif - - #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/chromium.h -=================================================================== ---- VirtualBox-6.0.6.orig/src/VBox/GuestHost/OpenGL/include/chromium.h -+++ VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/chromium.h -@@ -506,7 +506,11 @@ PROC WINAPI wglGetProcAddress_prox( LPCS - #ifndef GL_VERSION_1_5 - - typedef ptrdiff_t GLintptr; -+#if __BITS_PER_LONG != 64 - typedef ptrdiff_t GLsizeiptr; -+#else -+typedef long int GLsizeiptr; -+#endif - - /* prototype these functions for opengl_stub/getprocaddress.c */ - extern void APIENTRY glGenQueries(GLsizei n, GLuint *ids); - ++++++ remove_vbox_video_build.patch ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.265303170 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.265303170 +0100 @@ -1,20 +1,20 @@ -Index: VirtualBox-5.2.24/Makefile.kmk +Index: VirtualBox-6.1.0_BETA1/Makefile.kmk =================================================================== ---- VirtualBox-5.2.24.orig/Makefile.kmk -+++ VirtualBox-5.2.24/Makefile.kmk -@@ -701,7 +701,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \ +--- VirtualBox-6.1.0_BETA1.orig/Makefile.kmk ++++ VirtualBox-6.1.0_BETA1/Makefile.kmk +@@ -705,7 +705,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \ src/VBox/Additions/x11/vboxmouse \ src/VBox/Additions/x11/vboxmouse/xorg70 \ src/VBox/Additions/x11/vboxmouse/xorg71 \ - src/VBox/Additions/x11/vboxvideo \ src/VBox/NetworkServices \ - src/VBox/NetworkServices/DHCP \ + src/VBox/NetworkServices/Dhcpd \ src/VBox/NetworkServices/NAT \ -Index: VirtualBox-5.2.24/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +Index: VirtualBox-6.1.0_BETA1/src/VBox/Additions/x11/vboxvideo/Makefile.kmk =================================================================== ---- VirtualBox-5.2.24.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ VirtualBox-5.2.24/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -@@ -398,7 +398,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ VirtualBox-6.1.0_BETA1/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +@@ -395,7 +395,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES) vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS) @@ -24,10 +24,10 @@ # Build using local X.Org headers. We assume X.Org Server 1.7 or later. DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) -Index: VirtualBox-5.2.24/src/VBox/Additions/x11/Makefile.kmk +Index: VirtualBox-6.1.0_BETA1/src/VBox/Additions/x11/Makefile.kmk =================================================================== ---- VirtualBox-5.2.24.orig/src/VBox/Additions/x11/Makefile.kmk -+++ VirtualBox-5.2.24/src/VBox/Additions/x11/Makefile.kmk +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Additions/x11/Makefile.kmk ++++ VirtualBox-6.1.0_BETA1/src/VBox/Additions/x11/Makefile.kmk @@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk ++++++ switch_to_python3.4+.patch ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.277303174 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.277303174 +0100 @@ -1,47 +1,7 @@ -Index: VirtualBox-6.0.14/configure +Index: VirtualBox-6.1.0/src/bldprogs/scm.cpp =================================================================== ---- VirtualBox-6.0.14.orig/configure -+++ VirtualBox-6.0.14/configure -@@ -1977,17 +1977,17 @@ extern "C" int main(void) - { - Py_Initialize(); - printf("found version %s", PY_VERSION); --#if PY_VERSION_HEX >= 0x02060000 -+#if PY_VERSION_HEX >= 0x03040000 - printf(", OK.\n"); - return 0; - #else -- printf(", expected version 2.6 or higher\n"); -+ printf(", expected version 3.4 or higher\n"); - return 1; - #endif - } - EOF - found= -- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m" -+ SUPPYTHONLIBS="python3.4 python3.4m python3.5 python3.5m python3.6m python3.6 python3.7m python3.7 python3.8m python3.8" - for p in $PYTHONDIR; do - for d in $SUPPYTHONLIBS; do - for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do -Index: VirtualBox-6.0.14/src/VBox/Installer/linux/routines.sh -=================================================================== ---- VirtualBox-6.0.14.orig/src/VBox/Installer/linux/routines.sh -+++ VirtualBox-6.0.14/src/VBox/Installer/linux/routines.sh -@@ -391,8 +391,8 @@ terminate_proc() { - maybe_run_python_bindings_installer() { - VBOX_INSTALL_PATH="${1}" - -- PYTHON=python -- if [ "`python -c 'import sys -+ PYTHON=python3 -+ if [ "`python3 -c 'import sys - if sys.version_info >= (2, 6): - print \"test\"' 2> /dev/null`" != "test" ]; then - echo 1>&2 "Python 2.6 or later not available, skipping bindings installation." -Index: VirtualBox-6.0.14/src/bldprogs/scm.cpp -=================================================================== ---- VirtualBox-6.0.14.orig/src/bldprogs/scm.cpp -+++ VirtualBox-6.0.14/src/bldprogs/scm.cpp +--- VirtualBox-6.1.0.orig/src/bldprogs/scm.cpp ++++ VirtualBox-6.1.0/src/bldprogs/scm.cpp @@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA pszTreatAs = "shell"; else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0) @@ -51,10 +11,10 @@ else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0) || (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) ) pszTreatAs = "perl"; -Index: VirtualBox-6.0.14/src/libs/libxml2-2.9.4/configure +Index: VirtualBox-6.1.0/src/libs/libxml2-2.9.4/configure =================================================================== ---- VirtualBox-6.0.14.orig/src/libs/libxml2-2.9.4/configure -+++ VirtualBox-6.0.14/src/libs/libxml2-2.9.4/configure +--- VirtualBox-6.1.0.orig/src/libs/libxml2-2.9.4/configure ++++ VirtualBox-6.1.0/src/libs/libxml2-2.9.4/configure @@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES= PYTHON_TESTS= pythondir= @@ -79,10 +39,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PYTHON+:} false; then : -Index: VirtualBox-6.0.14/src/VBox/ValidationKit/testboxscript/setup.sh +Index: VirtualBox-6.1.0/src/VBox/ValidationKit/testboxscript/setup.sh =================================================================== ---- VirtualBox-6.0.14.orig/src/VBox/ValidationKit/testboxscript/setup.sh -+++ VirtualBox-6.0.14/src/VBox/ValidationKit/testboxscript/setup.sh +--- VirtualBox-6.1.0.orig/src/VBox/ValidationKit/testboxscript/setup.sh ++++ VirtualBox-6.1.0/src/VBox/ValidationKit/testboxscript/setup.sh @@ -652,7 +652,7 @@ import sys;\ x = sys.version_info[0] == 2 and (sys.version_info[1] >= 6 or (sys.version_info[1] == 5 and sys.version_info[2] >= 1));\ sys.exit(not x);\ @@ -92,10 +52,10 @@ do python=`which ${python} 2> /dev/null` if [ -n "${python}" -a -x "${python}" ]; then -Index: VirtualBox-6.0.14/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +Index: VirtualBox-6.1.0/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec =================================================================== ---- VirtualBox-6.0.14.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec -+++ VirtualBox-6.0.14/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +--- VirtualBox-6.1.0.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec ++++ VirtualBox-6.1.0/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec @@ -20,7 +20,7 @@ %define %PYTHON% 1 %define VBOXDOCDIR %{_defaultdocdir}/%NAME% @@ -114,10 +74,10 @@ %endif rm -rf sdk/installer mv nls $RPM_BUILD_ROOT/usr/share/virtualbox -Index: VirtualBox-6.0.14/src/libs/libxml2-2.9.4/libxml.spec.in +Index: VirtualBox-6.1.0/src/libs/libxml2-2.9.4/libxml.spec.in =================================================================== ---- VirtualBox-6.0.14.orig/src/libs/libxml2-2.9.4/libxml.spec.in -+++ VirtualBox-6.0.14/src/libs/libxml2-2.9.4/libxml.spec.in +--- VirtualBox-6.1.0.orig/src/libs/libxml2-2.9.4/libxml.spec.in ++++ VirtualBox-6.1.0/src/libs/libxml2-2.9.4/libxml.spec.in @@ -101,11 +101,11 @@ rm -fr %{buildroot} make install DESTDIR=%{buildroot} @@ -133,10 +93,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -Index: VirtualBox-6.0.14/src/libs/libxml2-2.9.4/libxml2.spec +Index: VirtualBox-6.1.0/src/libs/libxml2-2.9.4/libxml2.spec =================================================================== ---- VirtualBox-6.0.14.orig/src/libs/libxml2-2.9.4/libxml2.spec -+++ VirtualBox-6.0.14/src/libs/libxml2-2.9.4/libxml2.spec +--- VirtualBox-6.1.0.orig/src/libs/libxml2-2.9.4/libxml2.spec ++++ VirtualBox-6.1.0/src/libs/libxml2-2.9.4/libxml2.spec @@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot} %if 0%{?with_python3} @@ -146,10 +106,10 @@ make install DESTDIR=%{buildroot} %endif # with_python3 -Index: VirtualBox-6.0.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +Index: VirtualBox-6.1.0/src/libs/xpcom18a4/python/src/ErrorUtils.cpp =================================================================== ---- VirtualBox-6.0.14.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp -+++ VirtualBox-6.0.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +--- VirtualBox-6.1.0.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp ++++ VirtualBox-6.1.0/src/libs/xpcom18a4/python/src/ErrorUtils.cpp @@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc { // a temp scope so I can use temp locals. #if PY_MAJOR_VERSION <= 2 @@ -159,10 +119,10 @@ #else /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */ const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult); -Index: VirtualBox-6.0.14/src/libs/xpcom18a4/python/src/PyGBase.cpp +Index: VirtualBox-6.1.0/src/libs/xpcom18a4/python/src/PyGBase.cpp =================================================================== ---- VirtualBox-6.0.14.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp -+++ VirtualBox-6.0.14/src/libs/xpcom18a4/python/src/PyGBase.cpp +--- VirtualBox-6.1.0.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp ++++ VirtualBox-6.1.0/src/libs/xpcom18a4/python/src/PyGBase.cpp @@ -183,7 +183,11 @@ PyG_Base::~PyG_Base() // Get the correct interface pointer for this object given the IID. void *PyG_Base::ThisAsIID( const nsIID &iid ) @@ -176,24 +136,14 @@ if (iid.Equals(NS_GET_IID(nsISupports))) return (nsISupports *)(nsIInternalPython *)this; if (iid.Equals(NS_GET_IID(nsISupportsWeakReference))) -Index: VirtualBox-6.0.14/src/libs/xpcom18a4/python/Makefile.kmk +Index: VirtualBox-6.1.0/src/libs/xpcom18a4/python/Makefile.kmk =================================================================== ---- VirtualBox-6.0.14.orig/src/libs/xpcom18a4/python/Makefile.kmk -+++ VirtualBox-6.0.14/src/libs/xpcom18a4/python/Makefile.kmk -@@ -26,7 +26,7 @@ endif - - # - # List of supported Python versions, defining a number of --# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|DEF]_[INC|LIB] variables -+# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|DEF]_[INC|LIB] variables - # which get picked up below. - # - ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script. -@@ -486,6 +486,52 @@ VBoxPython3_7m_x86_LIBS = $(VBOX_P - endif +--- VirtualBox-6.1.0.orig/src/libs/xpcom18a4/python/Makefile.kmk ++++ VirtualBox-6.1.0/src/libs/xpcom18a4/python/Makefile.kmk +@@ -533,6 +533,52 @@ VBoxPython3_8m_x86_LIBS = $(VBOX_P endif endif -+ + +ifdef VBOX_PYTHON38_INC +# +# Python 3.8 version @@ -239,19 +189,20 @@ + endif + endif +endif - ++ ifdef VBOX_PYTHONDEF_INC # -Index: VirtualBox-6.0.14/src/libs/xpcom18a4/python/gen_python_deps.py + # Python without versioning +Index: VirtualBox-6.1.0/src/libs/xpcom18a4/python/gen_python_deps.py =================================================================== ---- VirtualBox-6.0.14.orig/src/libs/xpcom18a4/python/gen_python_deps.py -+++ VirtualBox-6.0.14/src/libs/xpcom18a4/python/gen_python_deps.py +--- VirtualBox-6.1.0.orig/src/libs/xpcom18a4/python/gen_python_deps.py ++++ VirtualBox-6.1.0/src/libs/xpcom18a4/python/gen_python_deps.py @@ -16,7 +16,7 @@ from __future__ import print_function import os,sys from distutils.version import StrictVersion --versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m"] -+versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m"] +-versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m" ] ++versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.8", "3.8m" ] prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"] known = {} ++++++ vbox-no-build-dates.diff ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.293303178 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.293303178 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.0.0/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +Index: VirtualBox-6.1.0_BETA2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp -+++ VirtualBox-6.0.0/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp ++++ VirtualBox-6.1.0_BETA2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) printf("VirtualBox DirectFB GUI built %s %s\n" @@ -11,10 +11,10 @@ for (;;) { -Index: VirtualBox-6.0.0/src/VBox/Runtime/common/string/uniread.cpp +Index: VirtualBox-6.1.0_BETA2/src/VBox/Runtime/common/string/uniread.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/Runtime/common/string/uniread.cpp -+++ VirtualBox-6.0.0/src/VBox/Runtime/common/string/uniread.cpp +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Runtime/common/string/uniread.cpp ++++ VirtualBox-6.1.0_BETA2/src/VBox/Runtime/common/string/uniread.cpp @@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const " * IPRT - Unicode Tables.\n" " *\n" @@ -24,10 +24,10 @@ " */\n" "\n" "/*\n" -Index: VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c =================================================================== ---- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c -+++ VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c ++++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -50,10 +50,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c =================================================================== ---- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c -+++ VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c ++++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c @@ -44,16 +44,10 @@ #ifndef XP_MAC #include "_pr_bld.h" @@ -73,10 +73,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c =================================================================== ---- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c -+++ VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c ++++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -99,10 +99,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c =================================================================== ---- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c -+++ VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c ++++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -125,11 +125,11 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.0.0/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp +Index: VirtualBox-6.1.0_BETA2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp -+++ VirtualBox-6.0.0/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp -@@ -147,7 +147,7 @@ static int vboxInitLogging(const char *p +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp ++++ VirtualBox-6.1.0_BETA2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +@@ -308,7 +308,7 @@ static int vboxInitLogging(const char *p #endif "Log opened %s\n", VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET, @@ -138,10 +138,10 @@ vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-6.0.0/src/VBox/Devices/PC/BIOS/bios.c +Index: VirtualBox-6.1.0_BETA2/src/VBox/Devices/PC/BIOS/bios.c =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/Devices/PC/BIOS/bios.c -+++ VirtualBox-6.0.0/src/VBox/Devices/PC/BIOS/bios.c +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Devices/PC/BIOS/bios.c ++++ VirtualBox-6.1.0_BETA2/src/VBox/Devices/PC/BIOS/bios.c @@ -143,7 +143,7 @@ void set_mode(uint8_t mode); #define BX_PCIBIOS 1 @@ -151,11 +151,11 @@ //-------------------------------------------------------------------------- // print_bios_banner // displays a the bios version -Index: VirtualBox-6.0.0/src/VBox/Additions/common/VBoxService/VBoxService.cpp +Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/common/VBoxService/VBoxService.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp -+++ VirtualBox-6.0.0/src/VBox/Additions/common/VBoxService/VBoxService.cpp -@@ -242,7 +242,7 @@ static DECLCALLBACK(void) vgsvcLogHeader +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp ++++ VirtualBox-6.1.0_BETA2/src/VBox/Additions/common/VBoxService/VBoxService.cpp +@@ -243,7 +243,7 @@ static DECLCALLBACK(void) vgsvcLogHeader "VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n" "Log opened %s\n", RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET, @@ -164,10 +164,10 @@ int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-6.0.0/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk -+++ VirtualBox-6.0.0/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk ++++ VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk @@ -187,7 +187,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature @@ -177,10 +177,10 @@ # Clean up $(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.0.0/src/VBox/ExtPacks/Skeleton/Makefile.kmk +Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/Skeleton/Makefile.kmk =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk -+++ VirtualBox-6.0.0/src/VBox/ExtPacks/Skeleton/Makefile.kmk +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk ++++ VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/Skeleton/Makefile.kmk @@ -161,7 +161,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_SKELETON_MA $(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.signature @@ -190,10 +190,10 @@ # Clean up $(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.0.0/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -+++ VirtualBox-6.0.0/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk ++++ VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk @@ -342,7 +342,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature @@ -203,10 +203,10 @@ # Clean up $(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.0.0/src/VBox/ExtPacks/VNC/Makefile.kmk +Index: VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/VNC/Makefile.kmk =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/ExtPacks/VNC/Makefile.kmk -+++ VirtualBox-6.0.0/src/VBox/ExtPacks/VNC/Makefile.kmk +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/ExtPacks/VNC/Makefile.kmk ++++ VirtualBox-6.1.0_BETA2/src/VBox/ExtPacks/VNC/Makefile.kmk @@ -154,7 +154,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature @@ -216,11 +216,11 @@ # Clean up $(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.0.0/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp -+++ VirtualBox-6.0.0/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp -@@ -316,7 +316,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp ++++ VirtualBox-6.1.0_BETA2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +@@ -318,7 +318,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv } VGDrvCommonInitLoggers(); @@ -229,10 +229,10 @@ /* * Check if the NT version is supported and initialize g_enmVGDrvNtVer. -Index: VirtualBox-6.0.0/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp -+++ VirtualBox-6.0.0/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp ++++ VirtualBox-6.1.0_BETA2/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp @@ -872,7 +872,7 @@ static DECLCALLBACK(void) vboxGreeterLog "vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release log\n" "Log opened %s\n", @@ -242,10 +242,10 @@ int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-6.0.0/src/VBox/Additions/solaris/Mouse/vboxms.c +Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/solaris/Mouse/vboxms.c =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/Additions/solaris/Mouse/vboxms.c -+++ VirtualBox-6.0.0/src/VBox/Additions/solaris/Mouse/vboxms.c +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Additions/solaris/Mouse/vboxms.c ++++ VirtualBox-6.1.0_BETA2/src/VBox/Additions/solaris/Mouse/vboxms.c @@ -256,7 +256,7 @@ static VBMSSTATE g_OpenNodeSt int _init(void) { @@ -255,36 +255,27 @@ mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL); /* * Prevent module autounloading. -Index: VirtualBox-6.0.0/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenVtf/GenVtf.h +Index: VirtualBox-6.1.0_BETA2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenVtf/GenVtf.h -+++ VirtualBox-6.0.0/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenVtf/GenVtf.h -@@ -102,7 +102,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF - // - #define UTILITY_MAJOR_VERSION 0 - #define UTILITY_MINOR_VERSION 1 --#define UTILITY_DATE __DATE__ -+#define UTILITY_DATE "no date" - - // - // The maximum number of arguments accepted from the command line. -Index: VirtualBox-6.0.0/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c -=================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c -+++ VirtualBox-6.0.0/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c -@@ -170,7 +170,7 @@ Returns: +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c ++++ VirtualBox-6.1.0_BETA2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c +@@ -247,10 +247,10 @@ Returns: + UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, - __BUILD_VERSION, -- __DATE__ +- __BUILD_VERSION ++ __BUILD_VERSION, + "no date" ); - // -Index: VirtualBox-6.0.0/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +- if (argc == 1) { + Usage (); + return -1; + } +Index: VirtualBox-6.1.0_BETA2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp -+++ VirtualBox-6.0.0/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp ++++ VirtualBox-6.1.0_BETA2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp @@ -118,7 +118,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject) { @@ -303,11 +294,11 @@ NTSTATUS Status = vboxUsbRtGlobalsInit(); Assert(Status == STATUS_SUCCESS); -Index: VirtualBox-6.0.0/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +Index: VirtualBox-6.1.0_BETA2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp -+++ VirtualBox-6.0.0/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp -@@ -1936,7 +1936,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp ++++ VirtualBox-6.1.0_BETA2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +@@ -1515,7 +1515,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB RTLogDestinations(0, "debugger"); #endif @@ -315,11 +306,11 @@ + LOGREL(("Built %s %s", "no date", "no time")); memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals)); - #ifdef VBOX_USB3PORT -Index: VirtualBox-6.0.0/src/VBox/Main/glue/VBoxLogRelCreate.cpp + +Index: VirtualBox-6.1.0_BETA2/src/VBox/Main/glue/VBoxLogRelCreate.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp -+++ VirtualBox-6.0.0/src/VBox/Main/glue/VBoxLogRelCreate.cpp +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp ++++ VirtualBox-6.1.0_BETA2/src/VBox/Main/glue/VBoxLogRelCreate.cpp @@ -61,7 +61,7 @@ static DECLCALLBACK(void) vboxHeaderFoot #endif "Log opened %s\n", @@ -329,10 +320,10 @@ pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE); int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); -Index: VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c =================================================================== ---- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c -+++ VirtualBox-6.0.0/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c ++++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c @@ -141,7 +141,7 @@ int main(int argc, char **argv) { PRIntn tab = 0; @@ -342,10 +333,10 @@ printf("Depend.c build time is %s %s\n", buildDate, buildTime); -Index: VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp -+++ VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp ++++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp @@ -458,7 +458,7 @@ int main() { @@ -355,10 +346,10 @@ #ifdef TEST_STD_STRING cout << "Testing std::string." << endl; #else -Index: VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp -+++ VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp ++++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp @@ -425,7 +425,7 @@ int main() { @@ -368,10 +359,10 @@ #if 0 { -Index: VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +Index: VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp =================================================================== ---- VirtualBox-6.0.0.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp -+++ VirtualBox-6.0.0/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +--- VirtualBox-6.1.0_BETA2.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp ++++ VirtualBox-6.1.0_BETA2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp @@ -102,7 +102,7 @@ class test_message public: test_message() @@ -381,10 +372,10 @@ } ~test_message() -Index: VirtualBox-6.0.0/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c +Index: VirtualBox-6.1.0_BETA2/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c =================================================================== ---- VirtualBox-6.0.0.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c -+++ VirtualBox-6.0.0/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c +--- VirtualBox-6.1.0_BETA2.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c ++++ VirtualBox-6.1.0_BETA2/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c @@ -29,9 +29,8 @@ #include "build_id.h" ++++++ vbox-vboxdrv-init-script.diff ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.313303185 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.313303185 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-6.0.10/src/VBox/Installer/linux/vboxdrv.sh +Index: VirtualBox-6.1.0_RC1/src/VBox/Installer/linux/vboxdrv.sh =================================================================== ---- VirtualBox-6.0.10.orig/src/VBox/Installer/linux/vboxdrv.sh -+++ VirtualBox-6.0.10/src/VBox/Installer/linux/vboxdrv.sh +--- VirtualBox-6.1.0_RC1.orig/src/VBox/Installer/linux/vboxdrv.sh ++++ VirtualBox-6.1.0_RC1/src/VBox/Installer/linux/vboxdrv.sh @@ -19,11 +19,12 @@ # ### BEGIN INIT INFO @@ -19,7 +19,7 @@ ### END INIT INFO ## @todo This file duplicates a lot of script with vboxadd.sh. When making -@@ -312,13 +313,6 @@ See the documenatation for your Linux di +@@ -315,13 +316,6 @@ See the documenatation for your Linux di fi fi # ensure permissions @@ -33,7 +33,7 @@ if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" fi -@@ -448,48 +442,8 @@ cleanup() +@@ -451,50 +445,8 @@ cleanup() # setup_script setup() { @@ -66,14 +66,16 @@ - module_build_log "$myerr" - failure "Look at $LOG to find out what went wrong" - fi -- log "Building the PCI pass-through module." -- if ! myerr=`$BUILDINTMP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxpci" \ -- --no-print-directory install 2>&1`; then -- log "Error building the module:" -- module_build_log "$myerr" -- failure "Look at $LOG to find out what went wrong" +- if test -e "$MODULE_SRC/vboxpci"; then +- log "Building the PCI pass-through module." +- if ! myerr=`$BUILDINTMP \ +- --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxpci" \ +- --no-print-directory install 2>&1`; then +- log "Error building the module:" +- module_build_log "$myerr" +- failure "Look at $LOG to find out what went wrong" +- fi - fi - rm -f /etc/vbox/module_not_compiled - depmod -a ++++++ vboxconfig.sh ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.345303194 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.345303194 +0100 @@ -9,8 +9,8 @@ LOGFILE="/var/log/virtualbox.log" INCLUDE="/lib/modules/`uname -r`/build/include" # -# Test if vboxpci module loaded. If it is, skip everything else -loaded=$(lsmod | grep vboxpci) +# Test if vboxdrv module loaded. If it is, skip everything else +loaded=$(lsmod | grep vboxdrv) if [ -n "$loaded" ] ; then echo "Kernel modules are loaded, unload them via" echo "systemctl stop vboxdrv.service if you wish to rebuild them." @@ -53,7 +53,7 @@ exit 1 fi depmod -a -modprobe -av vboxnetflt vboxnetadp vboxpci +modprobe -av vboxnetflt vboxnetadp popd > /dev/null 2>&1 echo "Kernel modules are installed and loaded." exit 0 ++++++ vboxdrv.sh ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.369303201 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.369303201 +0100 @@ -244,9 +244,6 @@ if ! $MODPROBE vboxnetadp > /dev/null 2>&1; then failure "modprobe vboxnetadp failed. Please use 'dmesg' to find out why" fi - if ! $MODPROBE vboxpci > /dev/null 2>&1; then - failure "modprobe vboxpci failed. Please use 'dmesg' to find out why" - fi # Create the /dev/vboxusb directory if the host supports that method # of USB access. The USB code checks for the existance of that path. if grep -q usb_device /proc/devices; then @@ -260,11 +257,6 @@ { begin_msg "Stopping VirtualBox services" console - if running vboxpci; then - if ! rmmod vboxpci 2>/dev/null; then - failure "Cannot unload module vboxpci" - fi - fi if running vboxnetadp; then if ! rmmod vboxnetadp 2>/dev/null; then failure "Cannot unload module vboxnetadp" @@ -293,10 +285,9 @@ # we are sure they were ours, i.e. they had our modules in beforehand. if test -e "${i}/extra/vboxdrv.ko" \ || test -e "${i}/extra/vboxnetadp.ko" \ - || test -e "${i}/extra/vboxnetflt.ko" \ - || test -e "${i}/extra/vboxpci.ko"; then + || test -e "${i}/extra/vboxnetflt.ko"; then rm -f "${i}/extra/vboxdrv.ko" "${i}/extra/vboxnetadp.ko" \ - "${i}/extra/vboxnetflt.ko" "${i}/extra/vboxpci.ko" + "${i}/extra/vboxnetflt.ko" # Remove the kernel version folder if it was empty except for us. test "`echo ${i}/extra/* ${i}/extra/.?* ${i}/* ${i}/.?*`" \ = "${i}/extra/* ${i}/extra/.. ${i}/extra ${i}/.." && @@ -324,9 +315,6 @@ str="$str, vboxnetadp" fi fi - if running vboxpci; then - str="$str, vboxpci" - fi echo "VirtualBox kernel modules ($str) are loaded." for i in $SHUTDOWN_USERS; do # don't create the ipcd directory with wrong permissions! ++++++ virtualbox-fix-ui-background-color.patch ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.421303217 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.421303217 +0100 @@ -1,7 +1,7 @@ -Index: b/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp @@ -114,10 +114,6 @@ void UITools::preparePalette() { /* Setup palette: */ @@ -13,11 +13,11 @@ } void UITools::prepareLayout() -Index: b/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp -@@ -1299,7 +1299,7 @@ void UIVirtualBoxManager::prepareMenuBar +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp +@@ -1328,7 +1328,7 @@ void UIVirtualBoxManager::prepareMenuBar /* Make sure menu-bar fills own solid background: */ menuBar()->setAutoFillBackground(true); QPalette pal = menuBar()->palette(); @@ -26,10 +26,10 @@ pal.setColor(QPalette::Active, QPalette::Button, color); menuBar()->setPalette(pal); } -Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp @@ -121,10 +121,6 @@ void UIChooser::preparePalette() { /* Setup palette: */ @@ -41,11 +41,11 @@ } void UIChooser::prepareLayout() -Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp -@@ -1025,7 +1025,7 @@ void UIChooserItemMachine::paintBackgrou +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp +@@ -902,7 +902,7 @@ void UIChooserItemMachine::paintBackgrou else { /* Prepare color: */ @@ -54,7 +54,7 @@ /* Draw gradient: */ QLinearGradient bgGrad(rectangle.topLeft(), rectangle.bottomLeft()); bgGrad.setColorAt(0, backgroundColor.lighter(m_iDefaultLightnessMax)); -@@ -1054,7 +1054,7 @@ void UIChooserItemMachine::paintBackgrou +@@ -931,7 +931,7 @@ void UIChooserItemMachine::paintBackgrou /* Default background: */ else { @@ -63,7 +63,7 @@ color1 = backgroundColor.lighter(m_iDefaultLightnessMax); color2 = backgroundColor.lighter(m_iDefaultLightnessMax - 70); } -@@ -1075,7 +1075,7 @@ void UIChooserItemMachine::paintBackgrou +@@ -952,7 +952,7 @@ void UIChooserItemMachine::paintBackgrou /* Default background: */ else { @@ -72,7 +72,7 @@ color1 = backgroundColor.lighter(m_iDefaultLightnessMin); color2 = backgroundColor.lighter(m_iDefaultLightnessMin - 40); } -@@ -1110,7 +1110,7 @@ void UIChooserItemMachine::paintFrame(QP +@@ -987,7 +987,7 @@ void UIChooserItemMachine::paintFrame(QP strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50); /* Default frame: */ else @@ -81,10 +81,10 @@ /* Create/assign pen: */ QPen pen(strokeColor); -Index: b/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp @@ -710,7 +710,7 @@ void UIToolsItem::paintBackground(QPaint /* Prepare color: */ const QColor backgroundColor = isEnabled() @@ -123,11 +123,11 @@ /* Create/assign pen: */ QPen pen(strokeColor); -Index: b/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp -@@ -355,14 +355,6 @@ void UIVirtualBoxManagerWidget::prepare( +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp +@@ -314,14 +314,6 @@ void UIVirtualBoxManagerWidget::prepare( { /* Configure palette: */ setAutoFillBackground(true); @@ -142,7 +142,7 @@ /* Prepare: */ prepareWidgets(); -@@ -490,7 +482,7 @@ void UIVirtualBoxManagerWidget::prepareW +@@ -449,7 +441,7 @@ void UIVirtualBoxManagerWidget::prepareW } /* Adjust splitter colors according to main widgets it splits: */ @@ -151,11 +151,11 @@ /* Set the initial distribution. The right site is bigger. */ m_pSplitter->setStretchFactor(0, 2); m_pSplitter->setStretchFactor(1, 3); -Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp -@@ -642,7 +642,7 @@ void UIChooserItem::paintFlatButton(QPai +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp +@@ -643,7 +643,7 @@ void UIChooserItem::paintFlatButton(QPai /* Prepare colors: */ const QPalette pal = QApplication::palette(); @@ -164,11 +164,11 @@ /* Prepare pen: */ QPen pen; -Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp -@@ -178,10 +178,6 @@ void UIChooserView::prepare() +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp +@@ -245,10 +245,6 @@ void UIChooserView::prepare() void UIChooserView::preparePalette() { /* Setup palette: */ @@ -179,10 +179,10 @@ } void UIChooserView::resizeEvent(QResizeEvent *pEvent) -Index: b/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp @@ -182,10 +182,6 @@ void UIToolsView::prepare() void UIToolsView::preparePalette() { @@ -194,11 +194,11 @@ } void UIToolsView::resizeEvent(QResizeEvent *pEvent) -Index: b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp -@@ -667,7 +667,7 @@ void UIDetailsElement::paintBackground(Q +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp +@@ -1183,7 +1183,7 @@ void UIDetailsElement::paintBackground(Q const QPalette pal = palette(); /* Paint default background: */ @@ -207,7 +207,7 @@ const QColor dcTone1 = defaultColor.lighter(m_iDefaultToneFinal); const QColor dcTone2 = defaultColor.lighter(m_iDefaultToneStart); QLinearGradient gradientDefault(fullRect.topLeft(), fullRect.bottomLeft()); -@@ -708,7 +708,7 @@ void UIDetailsElement::paintFrame(QPaint +@@ -1224,7 +1224,7 @@ void UIDetailsElement::paintFrame(QPaint : optionRect; /* Paint frame: */ @@ -216,10 +216,10 @@ QPen pen(strokeColor); pen.setWidth(0); pPainter->setPen(pen); -Index: b/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp @@ -110,7 +110,7 @@ void UIToolBar::paintEvent(QPaintEvent * const QRect rectangle = pEvent->rect(); @@ -229,10 +229,10 @@ QLinearGradient gradient(rectangle.topLeft(), rectangle.bottomLeft()); gradient.setColorAt(0, backgroundColor.lighter(130)); gradient.setColorAt(1, backgroundColor.lighter(125)); -Index: b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp @@ -700,7 +700,7 @@ void UIDetailsSet::paintBackground(QPain const QRect optionRect = pOptions->rect; @@ -242,11 +242,11 @@ pPainter->fillRect(optionRect, defaultColor); /* Restore painter: */ -Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp -@@ -655,7 +655,7 @@ void UIChooserItemGlobal::paintBackgroun +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp +@@ -639,7 +639,7 @@ void UIChooserItemGlobal::paintBackgroun pPainter->fillRect(rectangle, bgGrad); #else /* Prepare color: */ @@ -255,7 +255,7 @@ /* Draw gradient: */ pPainter->fillRect(rectangle, backgroundColor); #endif -@@ -686,7 +686,7 @@ void UIChooserItemGlobal::paintFrame(QPa +@@ -670,7 +670,7 @@ void UIChooserItemGlobal::paintFrame(QPa strokeColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(m_iHoverLightnessMin - 50); /* Default frame: */ else @@ -264,11 +264,11 @@ /* Create/assign pen: */ QPen pen(strokeColor); -Index: b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp -@@ -288,7 +288,7 @@ void UIDetailsGroup::paintBackground(QPa +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp +@@ -277,7 +277,7 @@ void UIDetailsGroup::paintBackground(QPa #ifdef VBOX_WS_MAC const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(145); #else @@ -277,23 +277,23 @@ #endif pPainter->fillRect(optionRect, defaultColor); -Index: b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp +Index: VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp =================================================================== ---- a/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp -+++ b/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp -@@ -1630,7 +1630,7 @@ void UIChooserItemGroup::paintBackground +--- VirtualBox-6.1.0_BETA1.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp ++++ VirtualBox-6.1.0_BETA1/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp +@@ -1499,7 +1499,7 @@ void UIChooserItemGroup::paintBackground const QPalette pal = palette(); const QColor headerColor = pal.color(QPalette::Active, - model()->currentItems().contains(this) ? + model()->selectedItems().contains(this) ? - QPalette::Highlight : QPalette::Midlight); + QPalette::Highlight : QPalette::Button); /* Root-item: */ if (isRoot()) -@@ -1714,7 +1714,7 @@ void UIChooserItemGroup::paintFrame(QPai +@@ -1596,7 +1596,7 @@ void UIChooserItemGroup::paintFrame(QPai const QPalette pal = palette(); const QColor strokeColor = pal.color(QPalette::Active, - model()->currentItems().contains(this) ? + model()->selectedItems().contains(this) ? - QPalette::Highlight : QPalette::Midlight).darker(headerDarkness() + 10); + QPalette::Highlight : QPalette::Button).darker(headerDarkness() + 10); ++++++ virtualbox-kmp-files ++++++ --- /var/tmp/diff_new_pack.bQGiIG/_old 2020-01-30 15:47:36.453303226 +0100 +++ /var/tmp/diff_new_pack.bQGiIG/_new 2020-01-30 15:47:36.453303226 +0100 @@ -4,6 +4,6 @@ /lib/modules/%2-%1/extra/vboxdrv.ko /lib/modules/%2-%1/extra/vboxnetadp.ko /lib/modules/%2-%1/extra/vboxnetflt.ko -/lib/modules/%2-%1/extra/vboxpci.ko /lib/modules/%2-%1/extra/vboxsf.ko /lib/modules/%2-%1/extra/vboxguest.ko +/lib/modules/%2-%1/extra/vboxvideo.ko

1 0

commit bazel for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package bazel for openSUSE:Leap:15.2 checked in at 2020-01-30 15:47:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/bazel (Old) and /work/SRC/openSUSE:Leap:15.2/.bazel.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bazel" Thu Jan 30 15:47:06 2020 rev:5 rq:768503 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/bazel/bazel.changes 2020-01-15 14:48:19.505337687 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.bazel.new.26092/bazel.changes 2020-01-30 15:47:19.765298204 +0100 @@ -1,0 +2,132 @@ +Tue Dec 17 13:35:41 UTC 2019 - Michał Rostecki <mrostecki(a)opensuse.org> + +- Switch bazel to default version 1.2. + +------------------------------------------------------------------- +Mon Dec 2 12:33:43 UTC 2019 - Michał Rostecki <mrostecki(a)opensuse.org> + +- Switch bazel to default version 0.29. + +------------------------------------------------------------------- +Thu Oct 17 14:23:53 UTC 2019 - Richard Brown <rbrown(a)suse.com> + +- Remove obsolete Groups tag (fate#326485) + +------------------------------------------------------------------- +Thu Jun 6 14:31:10 UTC 2019 - Michał Rostecki <mrostecki(a)opensuse.org> + +- Convert to a multiversion package. The real bazel binary is now + shipped in packages like bazel0.26, bazel0.25 etc. + +------------------------------------------------------------------- +Tue May 7 09:12:59 UTC 2019 - Michal Rostecki <mrostecki(a)opensuse.org> + +- Update to version 0.25.0: + * genrules now supports a $(RULEDIR) variable that resolves to + the directory where the outputs of the rule are put. + * Added --incompatible_windows_native_test_wrapper flag: enables + using the Bash-less test wrapper on Windows. (No-op on other + platforms.) + * incompatible_use_jdk11_as_host_javabase: makes JDK 11 the + default --host_javabase for remote jdk + * Makes genquery somepath output deterministic. + * Tristate attributes of native rules now reject True/False (use + 1/0) + * Rollback of "Tristate attributes of native rules now reject + True/False (use 1/0)" + * Tristate attributes of native rules now reject True/False (use + 1/0) + * Added -incompatible_do_not_split_linking_cmdline flag. + * A new flag --incompatible_string_join_requires_strings is + introduced. The sequence argument of string.join must contain + only string elements. + * Don't drop the analysis cache when the same --define flag is set + multiple times and the last value is the same (e.g. if the + current invocation was run with "--define foo=bar" and the + previous one was run with "--define foo=baz --define foo=bar"). + * Bazel is now ~20MiB smaller, from unbundling the Android rules' + runtime dependencies. + +------------------------------------------------------------------- +Tue Apr 9 20:17:30 UTC 2019 - Matthias Eliasson <elimat(a)opensuse.org> + +- Update to version 0.24.1 + Cherrypicks: + * Wrap StatusRuntimeExceptions from GrpcRemoteCache +- Changes in 0.24.0 + Incompatible changes: + * Added --incompatible_py3_is_default to test switching the default + Python version to PY3 for py_binary/py_test targets that do not + specify a version. + * //tools/cmd_line_differ has been renamed to //tools/aquery_differ + & can now compare (in addition to command lines) inputs of + actions given 2 aquery results. + * java_(mutable_|)proto_library: removed strict_deps attribute. + * The flag --incompatible_list_based_execution_strategy_selection + was added and is used to ease the migration to the new style of + specifying + execution strategy selection and fallback behavior. + * Added --incompatible_py2_outputs_are_suffixed, for switching the + bazel-bin symlink to point to Python 3 outputs instead of Python + 2 outputs. + New features: + * Make actions.args() object chainable. + * Added --incompatible_windows_style_arg_escaping flag: enables + correct subprocess argument escaping on Windows. (No-op on other + platforms.) + * Added --incompatible_windows_escape_jvm_flags flag: enables + correct java_binary.jvm_flags and java_test.jvm_flags + tokenization and escaping on Windows. (No-op on other platforms.) + Important changes: + * Allow running aquery against the current state of Skyframe + * Added support for the "navigation" resource directory to Android + resource processing in Bazel. This is used by the Navigation + Architecture Component. + * --incompatible_disable_runtimes_filegroups was flipped + * Incompatible flag --incompatible_linkopts_in_user_link_flags + has been flipped + * Incompatible flag --incompatible_dont_emit_static_libgcc has + been flipped + * --incompatible_disallow_filetype is enabled by default. + * Fixed issue where exceptions and stacktraces were silently + swallowed in the Android resource processing pipeline. + * --incompatible_disable_expand_if_all_available_in_flag_set has + been flipped + * --incompatible_disallow_dict_plus is enabled by default + * Adds --incompatible_disable_objc_library_resources to disable + resource attributes in objc_library. Please migrate these + attributes to data instead. + * --incompatible_disallow_old_style_args_add is enabled by default. + * Using the native module in BUILD files is deprecated. It will + be forbidden with --incompatible_disallow_native_in_build_file. + * (Python rules) PyRuntimeInfo is exposed to Starlark, making it + possible for Starlark rules to depend on or imitate py_runtime. + The files attribute of py_runtime is no longer mandatory. + * incompatible_use_toolchain_providers_in_java_common: pass + JavaToolchainInfo and JavaRuntimeInfo providers to java_common + APIs instead of configured + targets + * is_using_fission crosstool variable is now exposed in all compile + actions when fission is active (it used to be exposed only for + linking actions). + * incompatible_use_toolchain_providers_in_java_common: pass + JavaToolchainInfo and JavaRuntimeInfo providers to java_common + APIs instead of configured + targets + * py_runtime gains a python_version attribute for specifying + whether it represents a Python 2 or 3 interpreter. + * --incompatible_java_coverage is enabled by default. + * Starlark rules can safely declare attributes named "licenses" + * When using + --incompatible_list_based_execution_strategy_selection, Bazel + will use remote execution by default (if you specify + --remote_executor), otherwise persistent workers (if the action + supports it), otherwise sandboxed local execution (if the action + and platform supports it) and at last unsandboxed local + execution. The flags --spawn_strategy and --strategy continue to + work as before - this only sets new defaults for the case where + you don't specify these flags. + * Set default value of --incompatible_remap_main_repo to true. + * Set default value of --incompatible_remap_main_repo to true. + +------------------------------------------------------------------- Old: ---- bazel-0.22.0-dist.zip bazel-0.22.0-dist.zip.sig New: ---- README ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bazel.spec ++++++ --- /var/tmp/diff_new_pack.EUGzDl/_old 2020-01-30 15:47:21.441298708 +0100 +++ /var/tmp/diff_new_pack.EUGzDl/_new 2020-01-30 15:47:21.449298710 +0100 @@ -18,23 +18,14 @@ %define bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) Name: bazel -Version: 0.22.0 +Version: 1.2 Release: 0 Summary: Tool for the automation of building and testing of software License: Apache-2.0 -Group: Development/Tools/Building URL: http://bazel.io/ -Source0: https://github.com/bazelbuild/bazel/releases/download/%{version}/%{name}-%{… -Source1: https://github.com/bazelbuild/bazel/releases/download/%{version}/%{name}-%{… -BuildRequires: gcc-c++ -BuildRequires: java-1_8_0-openjdk-devel -BuildRequires: pkgconfig -BuildRequires: python -BuildRequires: unzip -BuildRequires: zip -BuildRequires: pkgconfig(bash-completion) -BuildRequires: pkgconfig(zlib) -Requires: java-1_8_0-openjdk-devel +Source: README +Provides: bazel = %{version} +Requires: bazel%{version} %ifarch armv7l ExclusiveArch: do_not_build %endif @@ -45,32 +36,13 @@ as mobile operating systems. %prep -%setup -q -c -# Remove executable permissions -chmod 0644 AUTHORS CHANGELOG.md CONTRIBUTORS LICENSE +cp %{SOURCE0} . %build -%ifarch aarch64 %arm -export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" -%endif -CC=gcc -CXX=g++ -EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" ./compile.sh -./output/bazel shutdown %install -export NO_BRP_STRIP_DEBUG=true -export NO_DEBUGINFO_STRIP_DEBUG=true -%define __debug_install_post %{nil} -: >debugfiles.list -: >debugsources.list -: >debugsourcefiles.list - -install -Dm0755 output/bazel %{buildroot}%{_bindir}/bazel %files -%doc AUTHORS CHANGELOG.md CONTRIBUTORS -%license LICENSE -%{_bindir}/bazel +%doc README %changelog ++++++ README ++++++ This is just a dummy package to pull the default bazel for the current distribution.

1 0

commit bazel0.29 for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package bazel0.29 for openSUSE:Leap:15.2 checked in at 2020-01-30 15:47:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/bazel0.29 (Old) and /work/SRC/openSUSE:Leap:15.2/.bazel0.29.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bazel0.29" Thu Jan 30 15:47:03 2020 rev:1 rq:767962 version:0.29.1 Changes: -------- New Changes file: --- /dev/null 2019-12-19 10:12:34.003146842 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.bazel0.29.new.26092/bazel0.29.changes 2020-01-30 15:47:11.109295598 +0100 @@ -0,0 +1,33 @@ +------------------------------------------------------------------- +Mon Dec 2 16:31:26 UTC 2019 - Klaus Kämpf <kkaempf(a)suse.com> + +- Add patch which fixes build on s390x architecture: + * 0002-fix-build-for-s390x.patch + +- s390x: build with Java 11, adapt Java stack/heap + +------------------------------------------------------------------- +Mon Dec 2 11:17:18 UTC 2019 - Klaus Kämpf <kkaempf(a)suse.com> + +- add _constraints to fix build on s390x + +------------------------------------------------------------------- +Wed Nov 27 09:06:58 UTC 2019 - Dirk Mueller <dmueller(a)suse.com> + +- revert aarch64 build workarounds, underlying problem has been fixed (bsc#1138529) + +------------------------------------------------------------------- +Tue Oct 15 14:44:54 UTC 2019 - Michał Rostecki <mrostecki(a)opensuse.org> + +- Add patch which fixes build on ppc64le architecture: + * 0001-fix-build-for-Power.patch + +------------------------------------------------------------------- +Tue Oct 15 11:17:15 UTC 2019 - Michał Rostecki <mrostecki(a)opensuse.org> + +- Fix collision between grpc's gettid and glibc's gettid + +------------------------------------------------------------------- +Wed Sep 11 16:42:29 UTC 2019 - Michał Rostecki <mrostecki(a)opensuse.org> + +- Initial release New: ---- 0001-fix-build-for-Power.patch 0002-fix-build-for-s390x.patch _constraints bazel-0.29.1-dist.zip bazel-0.29.1-dist.zip.sig bazel0.29.changes bazel0.29.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bazel0.29.spec ++++++ # # spec file for package bazel0.29 # # Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %define shortname bazel %define shortver 0.29 #Workaround for s390x (Java 1.8 runs out of memory) %ifarch s390x %if 0%{?suse_version} > 1500 %define openjdktouse java-12-openjdk-devel %else %define openjdktouse java-11-openjdk-devel %endif %else %define openjdktouse java-1_8_0-openjdk-devel %endif Name: bazel%{shortver} Version: 0.29.1 Release: 0 Summary: Tool for the automation of building and testing of software License: Apache-2.0 Group: Development/Tools/Building URL: http://bazel.io/ Source0: https://github.com/bazelbuild/bazel/releases/download/%{version}/%{shortnam… Source1: https://github.com/bazelbuild/bazel/releases/download/%{version}/%{shortnam… Patch1: 0001-fix-build-for-Power.patch Patch2: 0002-fix-build-for-s390x.patch BuildRequires: gcc-c++ BuildRequires: java-1_8_0-openjdk-devel BuildRequires: pkgconfig BuildRequires: python3 BuildRequires: unzip BuildRequires: zip BuildRequires: pkgconfig(bash-completion) BuildRequires: pkgconfig(zlib) Requires(post): update-alternatives Requires(postun): update-alternatives Requires: %{openjdktouse} Provides: bazel = %{version} ExcludeArch: %ix86 %description Tool for the automation of building and testing of software. It supports Java, C++ and Go as programing languages. It also has a support for Android and iOS as mobile operating systems. %prep %setup -q -c %patch1 -p1 %patch2 -p1 # Remove executable permissions chmod 0644 AUTHORS CHANGELOG.md CONTRIBUTORS LICENSE # Use Python 3 find . -type f $ -name "*.py" -o -name "*.txt" $ -exec sed -i 's|#!.*python.*|#!/usr/bin/python3|' "{}" + find . -type f -name "*.java" -exec sed -i 's|#!/usr/bin/env python|#!/usr/bin/python3|' "{}" + # Fix collision between grpc's gettid and glibc's gettid find third_party/grpc -type f -name "*.cc" -exec sed -i -e 's|gettid(|my_gettid(|g' {} + %build %ifarch aarch64 %arm export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" %endif %ifarch s390x export BAZEL_JAVAC_OPTS="-J-Xmx4g -J-Xms1g" %endif CC=gcc CXX=g++ EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" ./compile.sh ./scripts/generate_bash_completion.sh \ --bazel=output/bazel \ --output=output/bazel-complete.bash \ --prepend=scripts/bazel-complete-header.bash \ --prepend=scripts/bazel-complete-template.bash ./output/bazel shutdown %install export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >debugfiles.list : >debugsources.list : >debugsourcefiles.list install -Dm0755 output/bazel %{buildroot}%{_bindir}/bazel%{shortver} install -Dm0644 output/bazel-complete.bash %{buildroot}%{_datadir}/%{name}/bazel-complete.bash # update-alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives ln -sf %{_sysconfdir}/alternatives/bazel %{buildroot}%{_bindir}/bazel mkdir -p %{buildroot}%{_datadir}/bash-completion/completions ln -sf %{_sysconfdir}/alternatives/bazel-complete.bash %{buildroot}%{_datadir}/bash-completion/completions/bazel %post update-alternatives \ --install %{_bindir}/bazel bazel %{_bindir}/bazel%{shortver} 29 \ --slave %{_datadir}/bash-completion/completions/bazel \ bazel-complete.bash \ %{_datadir}/%{name}/bazel-complete.bash %postun if [ $1 -eq 0 ] ; then update-alternatives --remove bazel %{_bindir}/bazel%{shortver} fi %files %doc AUTHORS CHANGELOG.md CONTRIBUTORS %license LICENSE %{_bindir}/bazel %{_bindir}/bazel%{shortver} %{_datadir}/bash-completion/completions/bazel %dir %{_datadir}/%{name} %{_datadir}/%{name}/bazel-complete.bash %ghost %{_sysconfdir}/alternatives/bazel %ghost %{_sysconfdir}/alternatives/bazel-complete.bash %changelog ++++++ 0001-fix-build-for-Power.patch ++++++ From 837c9625207a997f3c1226d1299a2a53980fbe9b Mon Sep 17 00:00:00 2001 From: Christy Norman <christy(a)linux.vnet.ibm.com> Date: Fri, 27 Sep 2019 07:29:15 -0700 Subject: [PATCH 1/2] fix build for Power The zip -d flag will error if it doesn't find that extension. This is a fix for Power, but doesn't fix the default case. Signed-off-by: Christy Norman <christy(a)linux.vnet.ibm.com> Closes #9346. PiperOrigin-RevId: 271566240 --- src/conditions/BUILD | 6 ++++++ third_party/BUILD | 1 + 2 files changed, 7 insertions(+) diff --git a/src/conditions/BUILD b/src/conditions/BUILD index 2b28e28057..faa41a439d 100644 --- a/src/conditions/BUILD +++ b/src/conditions/BUILD @@ -10,6 +10,12 @@ filegroup( visibility = ["//src:__pkg__"], ) +config_setting( + name = "linux_ppc", + values = {"cpu": "ppc"}, + visibility = ["//visibility:public"], +) + config_setting( name = "linux_x86_64", values = {"cpu": "k8"}, diff --git a/third_party/BUILD b/third_party/BUILD index 159006d741..b2c0163d61 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -526,6 +526,7 @@ UNNECESSARY_DYNAMIC_LIBRARIES = select({ # The .so file is an x86 one, so we can just remove it if the CPU is not x86 "//src/conditions:arm": "*.so *.jnilib *.dll", "//src/conditions:linux_aarch64": "*.so *.jnilib *.dll", + "//src/conditions:linux_ppc": "*.so *.jnilib *.dll", # Play it safe -- better have a big binary than a slow binary # zip -d does require an argument. Supply something bogus. "//conditions:default": "*.bogusextension", -- 2.23.0 ++++++ 0002-fix-build-for-s390x.patch ++++++ diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-bazel/src/conditions/BUILD ./src/conditions/BUILD --- ../orig-bazel/src/conditions/BUILD 2019-12-02 17:29:24.692172896 +0100 +++ ./src/conditions/BUILD 2019-12-02 17:29:55.476790588 +0100 @@ -11,6 +11,12 @@ ) config_setting( + name = "linux_s390x", + values = {"cpu": "s390x"}, + visibility = ["//visibility:public"], +) + +config_setting( name = "linux_ppc", values = {"cpu": "ppc"}, visibility = ["//visibility:public"], diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-bazel/third_party/BUILD ./third_party/BUILD --- ../orig-bazel/third_party/BUILD 2019-12-02 17:29:31.784315198 +0100 +++ ./third_party/BUILD 2019-12-02 17:30:15.361189561 +0100 @@ -527,6 +527,7 @@ "//src/conditions:arm": "*.so *.jnilib *.dll", "//src/conditions:linux_aarch64": "*.so *.jnilib *.dll", "//src/conditions:linux_ppc": "*.so *.jnilib *.dll", + "//src/conditions:linux_s390x": "*.so *.jnilib *.dll", # Play it safe -- better have a big binary than a slow binary # zip -d does require an argument. Supply something bogus. "//conditions:default": "*.bogusextension", ++++++ _constraints ++++++ <constraints> <hardware> <physicalmemory> <size unit="M">8000</size> </physicalmemory> </hardware> </constraints>

1 0

commit scamper for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package scamper for openSUSE:Leap:15.2 checked in at 2020-01-30 15:47:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/scamper (Old) and /work/SRC/openSUSE:Leap:15.2/.scamper.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scamper" Thu Jan 30 15:47:02 2020 rev:13 rq:768474 version:20191102 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/scamper/scamper.changes 2020-01-30 06:07:36.378437762 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.scamper.new.26092/scamper.changes 2020-01-30 15:47:02.741293079 +0100 @@ -1,0 +2,31 @@ +Mon Jan 6 19:30:11 UTC 2020 - Sebastian Wagner <sebix+novell.com(a)sebix.at> + +-update to version 20191102: + * scamper + * escape hostname in json output for tracelb + * use length parameters when parsing hostname responses, from + Marianne Fletcher + * sc_bdrmap + * add a -O noalias option to tell bdrmap to not do alias resolution. + * update -C documentation in the sc_bdrmap.1 man page + * fix a memory leak of trace objects in -d traces + * print RTT in -d traces + * add an -M option to help corner cases with private and IXP addresses + * relax heuristics to allow VPs to claim routers with IP2AS when no + other router assignments can take place + * turn off analytical interface alias resolution heuristics by default + * sc_hoiho + * change -O verbose to -O debug to better reflect what it does. + * change tpa to atp to be consistent with language in paper + https://www.caida.org/~mjl/pubs/rnc.pdf + * free a malloc, pointed out by clang static analysis + * add support for reading -d 3 output, which is the format of + regular expressions provided in the data supplement: + http://data.caida.org/datasets/supplement/2019-imc-hoiho/ + * sc_uptime + * add a metadata table to be able to track metadata across sc_uptime + invocations, from Marianne Fletcher + * fix an error message when trying to create a database that + already exists. + +------------------------------------------------------------------- Old: ---- scamper-cvs-20190916.tar.gz New: ---- scamper-cvs-20191102.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scamper.spec ++++++ --- /var/tmp/diff_new_pack.6b42GT/_old 2020-01-30 15:47:03.421293283 +0100 +++ /var/tmp/diff_new_pack.6b42GT/_new 2020-01-30 15:47:03.421293283 +0100 @@ -1,7 +1,7 @@ # # spec file for package scamper # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2016, Martin Hauke <mardnh(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -18,12 +18,12 @@ Name: scamper -Version: 20190916 +Version: 20191102 Release: 0 Summary: Parallel Internet measurement utility License: GPL-2.0-only Group: Productivity/Networking/Diagnostic -Url: https://www.caida.org/tools/measurement/scamper/ +URL: https://www.caida.org/tools/measurement/scamper/ Source: https://www.caida.org/tools/measurement/%{name}/code/%{name}-cvs-%{version}… BuildRequires: libopenssl-devel BuildRequires: pkgconfig ++++++ scamper-cvs-20190916.tar.gz -> scamper-cvs-20191102.tar.gz ++++++ ++++ 2964 lines of diff (skipped)

1 0

commit httpie for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package httpie for openSUSE:Leap:15.2 checked in at 2020-01-30 15:47:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/httpie (Old) and /work/SRC/openSUSE:Leap:15.2/.httpie.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "httpie" Thu Jan 30 15:47:00 2020 rev:5 rq:768473 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/httpie/httpie.changes 2020-01-30 06:07:30.842434659 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.httpie.new.26092/httpie.changes 2020-01-30 15:47:01.393292673 +0100 @@ -1,0 +2,30 @@ +Sun Jan 12 10:25:17 UTC 2020 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 2.0.0 + * Removed Python 2.7 support (Python 3.6+ is now required). + * Added --offline to allow building an HTTP request and printing + it but not actually sending it over the network. + * Replaced the old collect-all-then-process handling of HTTP + communication with one-by-one processing of each HTTP request + or response as they become available. This means that you can + see headers immediately, see what is being send even when the + request fails, etc. + * Removed automatic config file creation to avoid concurrency + issues. + * Removed the default 30-second connection --timeout limit. + * Removed Python’s default limit of 100 response headers. + * Added --max-headers to allow setting the max header limit. + * Added --compress to allow request body compression. + * Added --ignore-netrc to allow bypassing credentials from + .netrc. + * Added https alias command with https:// as the default scheme. + * Added $ALL_PROXY documentation. + * Added type annotations throughout the codebase. + * Added tests/ to the PyPi package for the convenience of + downstream package maintainers. + * Fixed an error when stdin was a closed fd. + * Improved --debug output formatting. +- Update patch: + * httpie-adjust-requirements.patch + +------------------------------------------------------------------- Old: ---- httpie-1.0.3.tar.gz New: ---- httpie-2.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ httpie.spec ++++++ --- /var/tmp/diff_new_pack.FWodBK/_old 2020-01-30 15:47:02.149292900 +0100 +++ /var/tmp/diff_new_pack.FWodBK/_new 2020-01-30 15:47:02.153292902 +0100 @@ -1,7 +1,7 @@ # # spec file for package httpie # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 @@ -19,7 +19,7 @@ %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: httpie -Version: 1.0.3 +Version: 2.0.0 Release: 0 Summary: CLI, cURL-like tool for humans License: BSD-3-Clause @@ -77,6 +77,7 @@ %doc AUTHORS.rst CHANGELOG.rst README.rst %license LICENSE %python3_only %{_bindir}/http +%python3_only %{_bindir}/https %{python_sitelib}/* %{_mandir}/man1/http.1%{ext_man} ++++++ httpie-1.0.3.tar.gz -> httpie-2.0.0.tar.gz ++++++ ++++ 8554 lines of diff (skipped) ++++++ httpie-adjust-requirements.patch ++++++ --- /var/tmp/diff_new_pack.FWodBK/_old 2020-01-30 15:47:02.293292944 +0100 +++ /var/tmp/diff_new_pack.FWodBK/_new 2020-01-30 15:47:02.293292944 +0100 @@ -1,15 +1,15 @@ diff --git a/setup.py b/setup.py -index 3cb04c8..50075b3 100644 +index 4392270..2d18d38 100644 --- a/setup.py +++ b/setup.py @@ -35,8 +35,8 @@ tests_require = [ install_requires = [ -- 'requests>=2.21.0', -- 'Pygments>=2.3.1' -+ 'requests>=2.20.0', -+ 'Pygments>=2.2.0' +- 'requests>=2.22.0', +- 'Pygments>=2.5.2', ++ 'requests>=2.21.0', ++ 'Pygments>=2.3.1', ]

1 0

commit rubygem-rubyzip for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package rubygem-rubyzip for openSUSE:Leap:15.2 checked in at 2020-01-30 15:46:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/rubygem-rubyzip (Old) and /work/SRC/openSUSE:Leap:15.2/.rubygem-rubyzip.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-rubyzip" Thu Jan 30 15:46:58 2020 rev:13 rq:767767 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/rubygem-rubyzip/rubygem-rubyzip.changes 2020-01-15 15:59:45.955809248 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.rubygem-rubyzip.new.26092/rubygem-rubyzip.changes 2020-01-30 15:46:59.305292044 +0100 @@ -1,0 +2,54 @@ +Wed Nov 13 10:46:58 UTC 2019 - Dan Čermák <dcermak(a)suse.com> + +- Update to version 1.3 + This fixes CVE-2019-16892 + + Security + + - Add `validate_entry_sizes` option so that callers can trust an entry's reported size when using `extract` [#403](https://github.com/rubyzip/rubyzip/pull/403) + - This option defaults to `false` for backward compatibility in this release, but you are strongly encouraged to set it to `true`. It will default to `true` in rubyzip 2.0. + + New Feature + + - Add `add_stored` method to simplify adding entries without compression [#366](https://github.com/rubyzip/rubyzip/pull/366) + + Tooling / Documentation + + - Add more gem metadata links [#402](https://github.com/rubyzip/rubyzip/pull/402) + +------------------------------------------------------------------- +Tue Nov 12 19:41:31 UTC 2019 - Johannes Kastl <kastl(a)b1-systems.de> + +- used latest template for gem2rpm.yml +- add license to gem2rpm.yml to correctly get BSD-2-Clause + +------------------------------------------------------------------- +Tue Nov 12 14:29:07 UTC 2019 - Manuel Schnitzer <mschnitzer(a)suse.com> + +- updated to version 1.2.4 + + * Do not rewrite zip files opened with `open_buffer` that have not changed [#360](https://github.com/rubyzip/rubyzip/pull/360) + + Tooling / Documentation + + * Update `example_recursive.rb` in README [#397](https://github.com/rubyzip/rubyzip/pull/397) + * Hold CI at `trusty` for now, automatically pick the latest ruby patch version, use rbx-4 and hold jruby at 9.1 [#399](https://github.com/rubyzip/rubyzip/pull/399) + +------------------------------------------------------------------- +Mon Jul 8 07:53:40 UTC 2019 - Manuel Schnitzer <mschnitzer(a)suse.com> + +- updated to version 1.2.3 + + * Allow tilde in zip entry names [#391](https://github.com/rubyzip/rubyzip/pull/391) (fixes regression in 1.2.2 from [#376](https://github.com/rubyzip/rubyzip/pull/376)) + * Support frozen string literals in more files [#390](https://github.com/rubyzip/rubyzip/pull/390) + * Require `pathname` explicitly [#388](https://github.com/rubyzip/rubyzip/pull/388) (fixes regression in 1.2.2 from [#376](https://github.com/rubyzip/rubyzip/pull/376)) + + Tooling / Documentation: + + * CI updates [#392](https://github.com/rubyzip/rubyzip/pull/392), [#394](https://github.com/rubyzip/rubyzip/pull/394) + - Bump supported ruby versions and add 2.6 + - JRuby failures are no longer ignored (reverts [#375](https://github.com/rubyzip/rubyzip/pull/375) / part of [#371](https://github.com/rubyzip/rubyzip/pull/371)) + * Add changelog entry that was missing for last release [#387](https://github.com/rubyzip/rubyzip/pull/387) + * Comment cleanup [#385](https://github.com/rubyzip/rubyzip/pull/385) + +------------------------------------------------------------------- Old: ---- rubyzip-1.2.2.gem New: ---- rubyzip-1.3.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-rubyzip.spec ++++++ --- /var/tmp/diff_new_pack.EBvrtE/_old 2020-01-30 15:46:59.901292225 +0100 +++ /var/tmp/diff_new_pack.EBvrtE/_new 2020-01-30 15:46:59.909292227 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-rubyzip # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,28 +16,26 @@ # +%define mod_name rubyzip +%define mod_full_name %{mod_name}-%{version} # # This file was generated with a gem2rpm.yml and not just plain gem2rpm. # All sections marked as MANUAL, license headers, summaries and descriptions # can be maintained in that file. Please consult this file before editing any # of those fields # - Name: rubygem-rubyzip -Version: 1.2.2 +Version: 1.3.0 Release: 0 -%define mod_name rubyzip -%define mod_full_name %{mod_name}-%{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %{ruby >= 1.9.2} -BuildRequires: %{rubygem gem2rpm} -BuildRequires: ruby-macros >= 5 -Url: http://github.com/rubyzip/rubyzip -Source: https://rubygems.org/gems/%{mod_full_name}.gem -Source1: gem2rpm.yml Summary: rubyzip is a ruby module for reading and writing zip files License: BSD-2-Clause Group: Development/Languages/Ruby +URL: https://github.com/rubyzip/rubyzip +Source: https://rubygems.org/gems/%{mod_full_name}.gem +Source1: gem2rpm.yml +BuildRequires: %{ruby >= 1.9.2} +BuildRequires: %{rubygem gem2rpm} +BuildRequires: ruby-macros >= 5 %description rubyzip is a ruby module for reading and writing zip files. ++++++ gem2rpm.yml ++++++ --- /var/tmp/diff_new_pack.EBvrtE/_old 2020-01-30 15:46:59.957292241 +0100 +++ /var/tmp/diff_new_pack.EBvrtE/_new 2020-01-30 15:46:59.957292241 +0100 @@ -7,9 +7,9 @@ # # it can be multiline # ## used by gem2rpm -# :license: MIT or Ruby +:license: BSD-2-Clause # ## used by gem2rpm and gem_packages -# :version_suffix: -x_y +# :version_suffix: -1.3 # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm @@ -21,9 +21,11 @@ # ## used by gem2rpm # :patches: # foo.patch: -p1 -# bar.patch: +# bar.patch: +# :post_patch: +# if you need to fiddle with the source dir before rebuilding the gem # ## used by gem2rpm -:sources: +# :sources: # - foo.desktop # - bar.desktop # :gem_install_args: '....' @@ -54,7 +56,7 @@ # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages -# :custom: +# :custom_pkgs: # apache: # :preamble: |- # Requires: ..... @@ -67,4 +69,8 @@ # bar # :post: |- # /bin/echo foo -# +# :preamble: |- +# %if 0%{?suse_version} && 0%{?suse_version} < 1330 +# %define rb_build_versions ruby24 ruby25 +# %define rb_default_ruby_abi ruby:2.4.0 ruby:2.5.0 +# %endif ++++++ rubyzip-1.2.2.gem -> rubyzip-1.3.0.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 2018-08-31 18:20:18.000000000 +0200 +++ new/README.md 2019-09-25 21:38:00.000000000 +0200 @@ -1,4 +1,5 @@ # rubyzip + [![Gem Version](https://badge.fury.io/rb/rubyzip.svg)](http://badge.fury.io/rb/rubyzip) [![Build Status](https://secure.travis-ci.org/rubyzip/rubyzip.svg)](http://travis-ci… [![Code Climate](https://codeclimate.com/github/rubyzip/rubyzip.svg)](https://codec… @@ -19,9 +20,10 @@ ## Requirements -* Ruby 1.9.2 or greater +- Ruby 1.9.2 or greater ## Installation + Rubyzip is available on RubyGems: ``` @@ -59,7 +61,8 @@ ``` ### Zipping a directory recursively -Copy from [here](https://github.com/rubyzip/rubyzip/blob/05916bf89181e1955118fd3ea059f… ) + +Copy from [here](https://github.com/rubyzip/rubyzip/blob/9d891f7353e66052283562d3e252f… ```ruby require 'zip' @@ -83,7 +86,7 @@ # Zip the input directory. def write - entries = Dir.entries(@input_dir) - %w(. ..) + entries = Dir.entries(@input_dir) - %w[. ..] ::Zip::File.open(@output_file, ::Zip::File::CREATE) do |zipfile| write_entries entries, '', zipfile @@ -97,7 +100,6 @@ entries.each do |e| zipfile_path = path == '' ? e : File.join(path, e) disk_file_path = File.join(@input_dir, zipfile_path) - puts "Deflating #{disk_file_path}" if File.directory? disk_file_path recursively_deflate_directory(disk_file_path, zipfile, zipfile_path) @@ -109,14 +111,12 @@ def recursively_deflate_directory(disk_file_path, zipfile, zipfile_path) zipfile.mkdir zipfile_path - subdir = Dir.entries(disk_file_path) - %w(. ..) + subdir = Dir.entries(disk_file_path) - %w[. ..] write_entries subdir, zipfile_path, zipfile end def put_into_archive(disk_file_path, zipfile, zipfile_path) - zipfile.get_output_stream(zipfile_path) do |f| - f.write(File.open(disk_file_path, 'rb').read) - end + zipfile.add(zipfile_path, disk_file_path) end end ``` @@ -152,12 +152,15 @@ ### Reading a Zip file ```ruby +MAX_SIZE = 1024**2 # 1MiB (but of course you can increase this) Zip::File.open('foo.zip') do |zip_file| # Handle entries one by one zip_file.each do |entry| - # Extract to file/directory/symlink puts "Extracting #{entry.name}" - entry.extract(dest_file) + raise 'File too large when extracted' if entry.size > MAX_SIZE + + # Extract to file or directory based on name in the archive + entry.extract # Read into memory content = entry.get_input_stream.read @@ -165,6 +168,7 @@ # Find specific entry entry = zip_file.glob('*.csv').first + raise 'File too large when extracted' if entry.size > MAX_SIZE puts entry.get_input_stream.read end ``` @@ -177,7 +181,6 @@ > If bit 3 (0x08) of the general-purpose flags field is set, then the CRC-32 and file sizes are not known when the header is written. The fields in the local header are filled with zero, and the CRC-32 and size are appended in a 12-byte structure (optionally preceded by a 4-byte signature) immediately after the compressed data - If `::Zip::InputStream` finds such entry in the zip archive it will raise an exception. ### Password Protection (Experimental) @@ -220,7 +223,9 @@ ## Configuration -By default, rubyzip will not overwrite files if they already exist inside of the extracted path. To change this behavior, you may specify a configuration option like so: +### Existing Files + +By default, rubyzip will not overwrite files if they already exist inside of the extracted path. To change this behavior, you may specify a configuration option like so: ```ruby Zip.on_exists_proc = true @@ -234,32 +239,82 @@ Zip.continue_on_exists_proc = true ``` +### Non-ASCII Names + If you want to store non-english names and want to open them on Windows(pre 7) you need to set this option: ```ruby Zip.unicode_names = true ``` +Sometimes file names inside zip contain non-ASCII characters. If you can assume which encoding was used for such names and want to be able to find such entries using `find_entry` then you can force assumed encoding like so: + +```ruby +Zip.force_entry_names_encoding = 'UTF-8' +``` + +Allowed encoding names are the same as accepted by `String#force_encoding` + +### Date Validation + Some zip files might have an invalid date format, which will raise a warning. You can hide this warning with the following setting: ```ruby Zip.warn_invalid_date = false ``` +### Size Validation + +**This setting defaults to `false` in rubyzip 1.3 for backward compatibility, but it will default to `true` in rubyzip 2.0.** + +If you set +``` +Zip.validate_entry_sizes = true +``` +then `rubyzip`'s `extract` method checks that an entry's reported uncompressed size is not (significantly) smaller than its actual size. This is to help you protect your application against [zip bombs](https://en.wikipedia.org/wiki/Zip_bomb). Before `extract`ing an entry, you should check that its size is in the range you expect. For example, if your application supports processing up to 100 files at once, each up to 10MiB, your zip extraction code might look like: + +```ruby +MAX_FILE_SIZE = 10 * 1024**2 # 10MiB +MAX_FILES = 100 +Zip::File.open('foo.zip') do |zip_file| + num_files = 0 + zip_file.each do |entry| + num_files += 1 if entry.file? + raise 'Too many extracted files' if num_files > MAX_FILES + raise 'File too large when extracted' if entry.size > MAX_FILE_SIZE + entry.extract + end +end +``` + +If you need to extract zip files that report incorrect uncompressed sizes and you really trust them not too be too large, you can disable this setting with +```ruby +Zip.validate_entry_sizes = false +``` + +Note that if you use the lower level `Zip::InputStream` interface, `rubyzip` does *not* check the entry `size`s. In this case, the caller is responsible for making sure it does not read more data than expected from the input stream. + +### Default Compression + You can set the default compression level like so: ```ruby Zip.default_compression = Zlib::DEFAULT_COMPRESSION ``` + It defaults to `Zlib::DEFAULT_COMPRESSION`. Possible values are `Zlib::BEST_COMPRESSION`, `Zlib::DEFAULT_COMPRESSION` and `Zlib::NO_COMPRESSION` -Sometimes file names inside zip contain non-ASCII characters. If you can assume which encoding was used for such names and want to be able to find such entries using `find_entry` then you can force assumed encoding like so: +### Zip64 Support + +By default, Zip64 support is disabled for writing. To enable it do this: ```ruby -Zip.force_entry_names_encoding = 'UTF-8' +Zip.write_zip64_support = true ``` -Allowed encoding names are the same as accepted by `String#force_encoding` +_NOTE_: If you will enable Zip64 writing then you will need zip extractor with Zip64 support to extract archive. + +### Block Form You can set multiple settings at the same time by using a block: @@ -272,14 +327,6 @@ end ``` -By default, Zip64 support is disabled for writing. To enable it do this: - -```ruby -Zip.write_zip64_support = true -``` - -_NOTE_: If you will enable Zip64 writing then you will need zip extractor with Zip64 support to extract archive. - ## Developing To run the test you need to do this: Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/zip/entry.rb new/lib/zip/entry.rb --- old/lib/zip/entry.rb 2018-08-31 18:20:18.000000000 +0200 +++ new/lib/zip/entry.rb 2019-09-25 21:38:00.000000000 +0200 @@ -1,3 +1,4 @@ +require 'pathname' module Zip class Entry STORED = 0 @@ -117,7 +118,7 @@ return false unless cleanpath.relative? root = ::File::SEPARATOR naive_expanded_path = ::File.join(root, cleanpath.to_s) - cleanpath.expand_path(root).to_s == naive_expanded_path + ::File.absolute_path(cleanpath.to_s, root) == naive_expanded_path end def local_entry_offset #:nodoc:all @@ -275,10 +276,10 @@ zip64 = @extra['Zip64'] [::Zip::LOCAL_ENTRY_SIGNATURE, @version_needed_to_extract, # version needed to extract - @gp_flags, # @gp_flags , + @gp_flags, # @gp_flags @compression_method, - @time.to_binary_dos_time, # @last_mod_time , - @time.to_binary_dos_date, # @last_mod_date , + @time.to_binary_dos_time, # @last_mod_time + @time.to_binary_dos_date, # @last_mod_date @crc, zip64 && zip64.compressed_size ? 0xFFFFFFFF : @compressed_size, zip64 && zip64.original_size ? 0xFFFFFFFF : @size, @@ -432,11 +433,11 @@ @header_signature, @version, # version of encoding software @fstype, # filesystem type - @version_needed_to_extract, # @versionNeededToExtract , - @gp_flags, # @gp_flags , + @version_needed_to_extract, # @versionNeededToExtract + @gp_flags, # @gp_flags @compression_method, - @time.to_binary_dos_time, # @last_mod_time , - @time.to_binary_dos_date, # @last_mod_date , + @time.to_binary_dos_time, # @last_mod_time + @time.to_binary_dos_date, # @last_mod_date @crc, zip64 && zip64.compressed_size ? 0xFFFFFFFF : @compressed_size, zip64 && zip64.original_size ? 0xFFFFFFFF : @size, @@ -602,9 +603,21 @@ get_input_stream do |is| set_extra_attributes_on_path(dest_path) - buf = '' + bytes_written = 0 + warned = false + buf = ''.dup while (buf = is.sysread(::Zip::Decompressor::CHUNK_SIZE, buf)) os << buf + bytes_written += buf.bytesize + if bytes_written > size && !warned + message = "Entry #{name} should be #{size}B but is larger when inflated" + if ::Zip.validate_entry_sizes + raise ::Zip::EntrySizeError, message + else + puts "WARNING: #{message}" + warned = true + end + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/zip/errors.rb new/lib/zip/errors.rb --- old/lib/zip/errors.rb 2018-08-31 18:20:18.000000000 +0200 +++ new/lib/zip/errors.rb 2019-09-25 21:38:00.000000000 +0200 @@ -4,6 +4,7 @@ class DestinationFileExistsError < Error; end class CompressionMethodError < Error; end class EntryNameError < Error; end + class EntrySizeError < Error; end class InternalError < Error; end class GPFBit3Error < Error; end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/zip/extra_field.rb new/lib/zip/extra_field.rb --- old/lib/zip/extra_field.rb 2018-08-31 18:20:18.000000000 +0200 +++ new/lib/zip/extra_field.rb 2019-09-25 21:38:00.000000000 +0200 @@ -26,7 +26,7 @@ end def create_unknown_item - s = '' + s = ''.dup class << s alias_method :to_c_dir_bin, :to_s alias_method :to_local_bin, :to_s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/zip/file.rb new/lib/zip/file.rb --- old/lib/zip/file.rb 2018-08-31 18:20:18.000000000 +0200 +++ new/lib/zip/file.rb 2019-09-25 21:38:00.000000000 +0200 @@ -64,24 +64,38 @@ # Opens a zip archive. Pass true as the second parameter to create # a new archive if it doesn't exist already. - def initialize(file_name, create = false, buffer = false, options = {}) + def initialize(path_or_io, create = false, buffer = false, options = {}) super() - @name = file_name + @name = path_or_io.respond_to?(:path) ? path_or_io.path : path_or_io @comment = '' @create = create ? true : false # allow any truthy value to mean true - if !buffer && ::File.size?(file_name) + + if ::File.size?(@name.to_s) + # There is a file, which exists, that is associated with this zip. @create = false - @file_permissions = ::File.stat(file_name).mode - ::File.open(name, 'rb') do |f| - read_from_stream(f) + @file_permissions = ::File.stat(@name).mode + + if buffer + read_from_stream(path_or_io) + else + ::File.open(@name, 'rb') do |f| + read_from_stream(f) + end end + elsif buffer && path_or_io.size > 0 + # This zip is probably a non-empty StringIO. + read_from_stream(path_or_io) elsif @create + # This zip is completely new/empty and is to be created. @entry_set = EntrySet.new - elsif ::File.zero?(file_name) - raise Error, "File #{file_name} has zero size. Did you mean to pass the create flag?" + elsif ::File.zero?(@name) + # A file exists, but it is empty. + raise Error, "File #{@name} has zero size. Did you mean to pass the create flag?" else - raise Error, "File #{file_name} not found" + # Everything is wrong. + raise Error, "File #{@name} not found" end + @stored_entries = @entry_set.dup @stored_comment = @comment @restore_ownership = options[:restore_ownership] || false @@ -119,17 +133,16 @@ unless IO_METHODS.map { |method| io.respond_to?(method) }.all? || io.is_a?(String) raise "Zip::File.open_buffer expects a String or IO-like argument (responds to #{IO_METHODS.join(', ')}). Found: #{io.class}" end - if io.is_a?(::String) - require 'stringio' - io = ::StringIO.new(io) - elsif io.respond_to?(:binmode) - # https://github.com/rubyzip/rubyzip/issues/119 - io.binmode - end + + io = ::StringIO.new(io) if io.is_a?(::String) + + # https://github.com/rubyzip/rubyzip/issues/119 + io.binmode if io.respond_to?(:binmode) + zf = ::Zip::File.new(io, true, true, options) - zf.read_from_stream(io) return zf unless block_given? yield zf + begin zf.write_buffer(io) rescue IOError => e @@ -274,6 +287,13 @@ @entry_set << new_entry end + # Convenience method for adding the contents of a file to the archive + # in Stored format (uncompressed) + def add_stored(entry, src_path, &continue_on_exists_proc) + entry = ::Zip::Entry.new(@name, entry.to_s, nil, nil, nil, nil, ::Zip::Entry::STORED) + add(entry, src_path, &continue_on_exists_proc) + end + # Removes the specified entry. def remove(entry) @entry_set.delete(get_entry(entry)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/zip/inflater.rb new/lib/zip/inflater.rb --- old/lib/zip/inflater.rb 2018-08-31 18:20:18.000000000 +0200 +++ new/lib/zip/inflater.rb 2019-09-25 21:38:00.000000000 +0200 @@ -3,7 +3,7 @@ def initialize(input_stream, decrypter = NullDecrypter.new) super(input_stream) @zlib_inflater = ::Zlib::Inflate.new(-Zlib::MAX_WBITS) - @output_buffer = '' + @output_buffer = ''.dup @has_returned_empty_string = false @decrypter = decrypter end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/zip/version.rb new/lib/zip/version.rb --- old/lib/zip/version.rb 2018-08-31 18:20:18.000000000 +0200 +++ new/lib/zip/version.rb 2019-09-25 21:38:00.000000000 +0200 @@ -1,3 +1,3 @@ module Zip - VERSION = '1.2.2' + VERSION = '1.3.0' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/zip.rb new/lib/zip.rb --- old/lib/zip.rb 2018-08-31 18:20:18.000000000 +0200 +++ new/lib/zip.rb 2019-09-25 21:38:00.000000000 +0200 @@ -42,7 +42,8 @@ :write_zip64_support, :warn_invalid_date, :case_insensitive_match, - :force_entry_names_encoding + :force_entry_names_encoding, + :validate_entry_sizes def reset! @_ran_once = false @@ -54,6 +55,7 @@ @write_zip64_support = false @warn_invalid_date = true @case_insensitive_match = false + @validate_entry_sizes = false end def setup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2018-08-31 18:20:18.000000000 +0200 +++ new/metadata 2019-09-25 21:38:00.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: rubyzip version: !ruby/object:Gem::Version - version: 1.2.2 + version: 1.3.0 platform: ruby authors: - Alexander Simonov autorequire: bindir: bin cert_chain: [] -date: 2018-08-31 00:00:00.000000000 Z +date: 2019-09-25 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rake @@ -164,6 +164,7 @@ - test/data/path_traversal/jwilk/relative2.zip - test/data/path_traversal/jwilk/symlink.zip - test/data/path_traversal/relative1.zip +- test/data/path_traversal/tilde.zip - test/data/path_traversal/tuzovakaoff/README.md - test/data/path_traversal/tuzovakaoff/absolutepath.zip - test/data/path_traversal/tuzovakaoff/symlink.zip @@ -210,7 +211,12 @@ homepage: http://github.com/rubyzip/rubyzip licenses: - BSD 2-Clause -metadata: {} +metadata: + bug_tracker_uri: https://github.com/rubyzip/rubyzip/issues + changelog_uri: https://github.com/rubyzip/rubyzip/blob/v1.3.0/Changelog.md + documentation_uri: https://www.rubydoc.info/gems/rubyzip/1.3.0 + source_code_uri: https://github.com/rubyzip/rubyzip/tree/v1.3.0 + wiki_uri: https://github.com/rubyzip/rubyzip/wiki post_install_message: rdoc_options: [] require_paths: @@ -226,8 +232,7 @@ - !ruby/object:Gem::Version version: '0' requirements: [] -rubyforge_project: -rubygems_version: 2.6.13 +rubygems_version: 3.0.3 signing_key: specification_version: 4 summary: rubyzip is a ruby module for reading and writing zip files @@ -280,6 +285,7 @@ - test/data/rubycode2.zip - test/data/mimetype - test/data/zipWithEncryption.zip +- test/data/path_traversal/tilde.zip - test/data/path_traversal/Makefile - test/data/path_traversal/relative1.zip - test/data/path_traversal/jwilk/dirsymlink.zip Binary files old/test/data/path_traversal/tilde.zip and new/test/data/path_traversal/tilde.zip differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/file_extract_test.rb new/test/file_extract_test.rb --- old/test/file_extract_test.rb 2018-08-31 18:20:18.000000000 +0200 +++ new/test/file_extract_test.rb 2019-09-25 21:38:00.000000000 +0200 @@ -10,6 +10,10 @@ ::File.delete(EXTRACTED_FILENAME) if ::File.exist?(EXTRACTED_FILENAME) end + def teardown + ::Zip.reset! + end + def test_extract ::Zip::File.open(TEST_ZIP.zip_name) do |zf| zf.extract(ENTRY_TO_EXTRACT, EXTRACTED_FILENAME) @@ -80,4 +84,62 @@ end assert(!File.exist?(outFile)) end + + def test_extract_incorrect_size + # The uncompressed size fields in the zip file cannot be trusted. This makes + # it harder for callers to validate the sizes of the files they are + # extracting, which can lead to denial of service. See also + # https://en.wikipedia.org/wiki/Zip_bomb + Dir.mktmpdir do |tmp| + real_zip = File.join(tmp, 'real.zip') + fake_zip = File.join(tmp, 'fake.zip') + file_name = 'a' + true_size = 500_000 + fake_size = 1 + + ::Zip::File.open(real_zip, ::Zip::File::CREATE) do |zf| + zf.get_output_stream(file_name) do |os| + os.write 'a' * true_size + end + end + + compressed_size = nil + ::Zip::File.open(real_zip) do |zf| + a_entry = zf.find_entry(file_name) + compressed_size = a_entry.compressed_size + assert_equal true_size, a_entry.size + end + + true_size_bytes = [compressed_size, true_size, file_name.size].pack('LLS') + fake_size_bytes = [compressed_size, fake_size, file_name.size].pack('LLS') + + data = File.binread(real_zip) + assert data.include?(true_size_bytes) + data.gsub! true_size_bytes, fake_size_bytes + + File.open(fake_zip, 'wb') do |file| + file.write data + end + + Dir.chdir tmp do + ::Zip::File.open(fake_zip) do |zf| + a_entry = zf.find_entry(file_name) + assert_equal fake_size, a_entry.size + + ::Zip.validate_entry_sizes = false + a_entry.extract + assert_equal true_size, File.size(file_name) + FileUtils.rm file_name + + ::Zip.validate_entry_sizes = true + error = assert_raises ::Zip::EntrySizeError do + a_entry.extract + end + assert_equal \ + 'Entry a should be 1B but is larger when inflated', + error.message + end + end + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/file_test.rb new/test/file_test.rb --- old/test/file_test.rb 2018-08-31 18:20:18.000000000 +0200 +++ new/test/file_test.rb 2019-09-25 21:38:00.000000000 +0200 @@ -103,6 +103,13 @@ end end + def test_open_buffer_with_string + string = File.read('test/data/rubycode.zip') + ::Zip::File.open_buffer string do |zf| + assert zf.entries.map { |e| e.name }.include?('zippedruby1.rb') + end + end + def test_open_buffer_with_stringio string_io = StringIO.new File.read('test/data/rubycode.zip') ::Zip::File.open_buffer string_io do |zf| @@ -113,14 +120,52 @@ def test_close_buffer_with_stringio string_io = StringIO.new File.read('test/data/rubycode.zip') zf = ::Zip::File.open_buffer string_io - assert(zf.close || true) # Poor man's refute_raises + assert_nil zf.close + end + + def test_open_buffer_no_op_does_not_change_file + Dir.mktmpdir do |tmp| + test_zip = File.join(tmp, 'test.zip') + FileUtils.cp 'test/data/rubycode.zip', test_zip + + # Note: this may change the file if it is opened with r+b instead of rb. + # The 'extra fields' in this particular zip file get reordered. + File.open(test_zip, 'rb') do |file| + Zip::File.open_buffer(file) do |zf| + nil # do nothing + end + end + + assert_equal \ + File.binread('test/data/rubycode.zip'), + File.binread(test_zip) + end + end + + def test_open_buffer_close_does_not_change_file + Dir.mktmpdir do |tmp| + test_zip = File.join(tmp, 'test.zip') + FileUtils.cp 'test/data/rubycode.zip', test_zip + + File.open(test_zip, 'rb') do |file| + zf = Zip::File.open_buffer(file) + refute zf.commit_required? + assert_nil zf.close + end + + assert_equal \ + File.binread('test/data/rubycode.zip'), + File.binread(test_zip) + end end - def test_close_buffer_with_io - f = File.open('test/data/rubycode.zip') - zf = ::Zip::File.open_buffer f - assert zf.close - f.close + def test_open_buffer_with_io_and_block + File.open('test/data/rubycode.zip') do |io| + io.set_encoding(Encoding::BINARY) # not strictly required but can be set + Zip::File.open_buffer(io) do |zip_io| + # left empty on purpose + end + end end def test_open_buffer_without_block @@ -158,6 +203,26 @@ AssertEntry.assert_contents(srcFile, zfRead.get_input_stream(entryName) { |zis| zis.read }) end + + def test_add_stored + srcFile = 'test/data/file2.txt' + entryName = 'newEntryName.rb' + assert(::File.exist?(srcFile)) + zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE) + zf.add_stored(entryName, srcFile) + zf.close + + zfRead = ::Zip::File.new(EMPTY_FILENAME) + entry = zfRead.entries.first + assert_equal('', zfRead.comment) + assert_equal(1, zfRead.entries.length) + assert_equal(entryName, entry.name) + assert_equal(File.size(srcFile), entry.size) + assert_equal(entry.size, entry.compressed_size) + assert_equal(::Zip::Entry::STORED, entry.compression_method) + AssertEntry.assert_contents(srcFile, + zfRead.get_input_stream(entryName) { |zis| zis.read }) + end def test_recover_permissions_after_add_files_to_archive srcZip = TEST_ZIP.zip_name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/path_traversal_test.rb new/test/path_traversal_test.rb --- old/test/path_traversal_test.rb 2018-08-31 18:20:18.000000000 +0200 +++ new/test/path_traversal_test.rb 2019-09-25 21:38:00.000000000 +0200 @@ -131,4 +131,11 @@ refute File.exist?('/tmp/file.txt') end end + + def test_entry_name_with_tilde + in_tmpdir do + extract_path_traversal_zip 'tilde.zip' + assert File.exist?('~tilde~') + end + end end

1 0

commit rubygem-public_suffix for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package rubygem-public_suffix for openSUSE:Leap:15.2 checked in at 2020-01-30 15:46:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/rubygem-public_suffix (Old) and /work/SRC/openSUSE:Leap:15.2/.rubygem-public_suffix.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-public_suffix" Thu Jan 30 15:46:56 2020 rev:15 rq:767698 version:4.0.3 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/rubygem-public_suffix/rubygem-public_suffix.changes 2020-01-15 15:59:36.715804351 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.rubygem-public_suffix.new.26092/rubygem-public_suffix.changes 2020-01-30 15:46:56.673291253 +0100 @@ -1,0 +2,30 @@ +Mon Jan 27 11:29:44 UTC 2020 - Manuel Schnitzer <mschnitzer(a)suse.com> + +- updated to version 4.0.3 + + # Fixed + + * Fixed 2.7 deprecations and warnings (GH-167). [Thanks @BrianHawley] + +------------------------------------------------------------------- +Tue Nov 12 15:03:01 UTC 2019 - Manuel Schnitzer <mschnitzer(a)suse.com> + +- updated to version 4.0.1 + + * CHANGED: Updated definitions. + +------------------------------------------------------------------- +Mon Jul 8 06:56:24 UTC 2019 - Manuel Schnitzer <mschnitzer(a)suse.com> + +- updated to version 4.0.0 + + * CHANGED: Minimum Ruby version is 2.3 + +------------------------------------------------------------------- +Thu Aug 16 10:18:54 UTC 2018 - mschnitzer(a)suse.com + +- updated to version 3.0.3 + + CHANGED: Updated definitions. + +------------------------------------------------------------------- Old: ---- public_suffix-3.0.2.gem New: ---- public_suffix-4.0.3.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-public_suffix.spec ++++++ --- /var/tmp/diff_new_pack.2acgZd/_old 2020-01-30 15:46:57.185291406 +0100 +++ /var/tmp/diff_new_pack.2acgZd/_new 2020-01-30 15:46:57.193291409 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-public_suffix # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,12 +24,12 @@ # Name: rubygem-public_suffix -Version: 3.0.2 +Version: 4.0.3 Release: 0 %define mod_name public_suffix %define mod_full_name %{mod_name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %{ruby >= 2.1} +BuildRequires: %{ruby >= 2.3} BuildRequires: %{rubygem gem2rpm} BuildRequires: ruby-macros >= 5 Url: https://simonecarletti.com/code/publicsuffix-ruby ++++++ public_suffix-3.0.2.gem -> public_suffix-4.0.3.gem ++++++ ++++ 6035 lines of diff (skipped)

1 0