diff --git a/files/Do-not-hang-ScummVM-when-opening-a-browser.patch b/files/Do-not-hang-ScummVM-when-opening-a-browser.patch deleted file mode 100644 --- a/files/Do-not-hang-ScummVM-when-opening-a-browser.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 008149e3576aa8d13c6831ee0c1d25c3c23deb83 Mon Sep 17 00:00:00 2001 -From: Colin Snover -Date: Thu, 14 Dec 2017 14:30:16 -0600 -Subject: [PATCH 2/2] POSIX: Do not hang ScummVM when opening a browser - -If the call used to open the browser does not return until the -browser is closed, this would previously cause ScummVM to hang. -Since we are using waitpid now, we can avoid hanging by telling -waitpid to not block on a child which has not exited. ---- - backends/platform/sdl/posix/posix.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp -index 60f85efc2f..b01de2d240 100644 ---- a/backends/platform/sdl/posix/posix.cpp -+++ b/backends/platform/sdl/posix/posix.cpp -@@ -320,7 +320,7 @@ bool OSystem_POSIX::launchBrowser(const Common::String &client, const Common::St - if (posix_spawnp(&pid, client.c_str(), NULL, NULL, const_cast(argv), environ) != 0) { - return false; - } -- return (waitpid(pid, NULL, 0) != -1); -+ return (waitpid(pid, NULL, WNOHANG) != -1); - } - - AudioCDManager *OSystem_POSIX::createAudioCDManager() { --- -2.14.3 - diff --git a/files/security/CVE-2017-17528.patch b/files/security/CVE-2017-17528.patch deleted file mode 100644 --- a/files/security/CVE-2017-17528.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 7aaac1dfba22d2e70b33b2cf856d7885944d4a6e Mon Sep 17 00:00:00 2001 -From: Colin Snover -Date: Thu, 14 Dec 2017 13:51:04 -0600 -Subject: [PATCH 1/2] POSIX: Fix CVE-2017-17528 - ---- - backends/platform/sdl/posix/posix.cpp | 28 ++++++++++++++++++++-------- - 1 file changed, 20 insertions(+), 8 deletions(-) - -diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp -index b805a452cf..60f85efc2f 100644 ---- a/backends/platform/sdl/posix/posix.cpp -+++ b/backends/platform/sdl/posix/posix.cpp -@@ -49,6 +49,9 @@ - #include - #include - -+#include -+extern char **environ; -+ - OSystem_POSIX::OSystem_POSIX(Common::String baseConfigName) - : - _baseConfigName(baseConfigName) { -@@ -279,7 +282,7 @@ bool OSystem_POSIX::openUrl(const Common::String &url) { - // try desktop environment specific tools - if (launchBrowser("gnome-open", url)) // gnome - return true; -- if (launchBrowser("kfmclient openURL", url)) // kde -+ if (launchBrowser("kfmclient", url)) // kde - return true; - if (launchBrowser("exo-open", url)) // xfce - return true; -@@ -302,15 +305,24 @@ bool OSystem_POSIX::openUrl(const Common::String &url) { - return false; - } - --bool OSystem_POSIX::launchBrowser(const Common::String& client, const Common::String &url) { -- // FIXME: system's input must be heavily escaped -- // well, when url's specified by user -- // it's OK now (urls are hardcoded somewhere in GUI) -- Common::String cmd = client + " " + url; -- return (system(cmd.c_str()) != -1); -+bool OSystem_POSIX::launchBrowser(const Common::String &client, const Common::String &url) { -+ pid_t pid; -+ const char *argv[] = { -+ client.c_str(), -+ url.c_str(), -+ NULL, -+ NULL -+ }; -+ if (client == "kfmclient") { -+ argv[2] = argv[1]; -+ argv[1] = "openURL"; -+ } -+ if (posix_spawnp(&pid, client.c_str(), NULL, NULL, const_cast(argv), environ) != 0) { -+ return false; -+ } -+ return (waitpid(pid, NULL, 0) != -1); - } - -- - AudioCDManager *OSystem_POSIX::createAudioCDManager() { - #ifdef USE_LINUXCD - return createLinuxAudioCDManager(); --- -2.14.3 - diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,12 +1,11 @@ name : scummvm -version : 2.0.0 -release : 12 +version : 2.1.0 +release : 13 source : - - https://github.com/scummvm/scummvm/archive/v2.0.0.tar.gz : 1a7cb080d956220657734ac42f75168552171bd13983d58c4bd07fdf31bcc59a + - https://github.com/scummvm/scummvm/archive/v2.1.0.tar.gz : caa64f994e60166f6cb575fb9008964a3654e164e334d8f9e732cd549c3da6bb license : GPL-2.0-only component : games.emulator -summary : ScummVM is a program which allows you to run certain classic graphical - point-and-click adventure games, provided you already have their data files +summary : ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files description: | ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed! builddeps : @@ -24,13 +23,13 @@ - faad-devel - libmad-devel setup : | - %patch -p1 < $pkgfiles/security/CVE-2017-17528.patch - %patch -p1 < $pkgfiles/Do-not-hang-ScummVM-when-opening-a-browser.patch ./configure --prefix=/usr build : | %make install : | %make_install + rm -fr $installdir/usr/share/doc + install -D -m00644 dists/scummvm.desktop $installdir/usr/share/applications/scummvm.desktop check : | %make test diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ scummvm - F. von Gellhorn - flinux@vongellhorn.ch + Pierre-Yves + pyu@riseup.net GPL-2.0-only games.emulator @@ -22,19 +22,13 @@ /usr/bin/scummvm /usr/share/appdata/scummvm.appdata.xml /usr/share/applications/scummvm.desktop - /usr/share/doc/scummvm/AUTHORS - /usr/share/doc/scummvm/COPYING - /usr/share/doc/scummvm/COPYING.BSD - /usr/share/doc/scummvm/COPYING.FREEFONT - /usr/share/doc/scummvm/COPYING.LGPL - /usr/share/doc/scummvm/COPYRIGHT - /usr/share/doc/scummvm/NEWS - /usr/share/doc/scummvm/README /usr/share/icons/hicolor/scalable/apps/scummvm.svg /usr/share/man/man6/scummvm.6 /usr/share/pixmaps/scummvm.xpm /usr/share/scummvm/access.dat + /usr/share/scummvm/cryomni3d.dat /usr/share/scummvm/drascula.dat + /usr/share/scummvm/fonts.dat /usr/share/scummvm/hugo.dat /usr/share/scummvm/kyra.dat /usr/share/scummvm/lure.dat @@ -44,22 +38,25 @@ /usr/share/scummvm/queen.tbl /usr/share/scummvm/scummclassic.zip /usr/share/scummvm/scummmodern.zip + /usr/share/scummvm/scummremastered.zip /usr/share/scummvm/sky.cpt + /usr/share/scummvm/supernova.dat /usr/share/scummvm/teenagent.dat /usr/share/scummvm/titanic.dat /usr/share/scummvm/tony.dat /usr/share/scummvm/toon.dat /usr/share/scummvm/translations.dat /usr/share/scummvm/wintermute.zip + /usr/share/scummvm/xeen.ccs - - 2019-07-31 - 2.0.0 + + 2019-10-30 + 2.1.0 Packaging update - F. von Gellhorn - flinux@vongellhorn.ch + Pierre-Yves + pyu@riseup.net \ No newline at end of file