From 668cc9242800b30ed1dcb453c13093c247035afa Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 3 Apr 2018 15:32:28 -0400 Subject: [PATCH] Update to 0.114 --- .gitignore | 1 + ...-s-format-string-to-remaining-report.patch | 87 +++++++++++++++++++ polkit.spec | 20 ++--- sources | 3 +- 4 files changed, 97 insertions(+), 14 deletions(-) create mode 100644 0001-jsauthority-pass-s-format-string-to-remaining-report.patch diff --git a/.gitignore b/.gitignore index aa05492..eab2d14 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ polkit-0.98.tar.gz /polkit-0.112.tar.gz.sign /polkit-0.113.tar.gz /polkit-0.113.tar.gz.sign +/polkit-0.114.tar.gz diff --git a/0001-jsauthority-pass-s-format-string-to-remaining-report.patch b/0001-jsauthority-pass-s-format-string-to-remaining-report.patch new file mode 100644 index 0000000..eac66ba --- /dev/null +++ b/0001-jsauthority-pass-s-format-string-to-remaining-report.patch @@ -0,0 +1,87 @@ +From 373705b35e7f6c7dc83de5e0a3ce11ecd15d0409 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Tue, 3 Apr 2018 15:26:37 -0400 +Subject: [PATCH] jsauthority: pass "%s" format string to remaining report + function + +commit 00adeee1b62 attempted to add a "%s" format string to the +two JS_Report invocations that needed it, but somehow only got +one them. + +This commit gets the other one. + +https://bugzilla.gnome.org/show_bug.cgi?id=105865 +--- + src/polkitbackend/polkitbackendjsauthority.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp +index 9746c47..517f3c6 100644 +--- a/src/polkitbackend/polkitbackendjsauthority.cpp ++++ b/src/polkitbackend/polkitbackendjsauthority.cpp +@@ -1265,61 +1265,61 @@ polkit_backend_js_authority_check_authorization_sync (PolkitBackendInteractiveAu + } + + good = TRUE; + + out: + if (!good) + ret = POLKIT_IMPLICIT_AUTHORIZATION_NOT_AUTHORIZED; + g_free (ret_str); + + JS_MaybeGC (authority->priv->cx); + + JS_EndRequest (authority->priv->cx); + + return ret; + } + + /* ---------------------------------------------------------------------------------------------------- */ + + static bool + js_polkit_log (JSContext *cx, + unsigned argc, + JS::Value *vp) + { + /* PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (JS_GetContextPrivate (cx)); */ + bool ret = false; + char *s; + + JS::CallArgs args = JS::CallArgsFromVp (argc, vp); + + s = JS_EncodeString (cx, args[0].toString ()); +- JS_ReportWarningUTF8 (cx, s); ++ JS_ReportWarningUTF8 (cx, "%s", s); + JS_free (cx, s); + + ret = true; + + args.rval ().setUndefined (); /* return undefined */ + + return ret; + } + + /* ---------------------------------------------------------------------------------------------------- */ + + static const gchar * + get_signal_name (gint signal_number) + { + switch (signal_number) + { + #define _HANDLE_SIG(sig) case sig: return #sig; + _HANDLE_SIG (SIGHUP); + _HANDLE_SIG (SIGINT); + _HANDLE_SIG (SIGQUIT); + _HANDLE_SIG (SIGILL); + _HANDLE_SIG (SIGABRT); + _HANDLE_SIG (SIGFPE); + _HANDLE_SIG (SIGKILL); + _HANDLE_SIG (SIGSEGV); + _HANDLE_SIG (SIGPIPE); + _HANDLE_SIG (SIGALRM); + _HANDLE_SIG (SIGTERM); + _HANDLE_SIG (SIGUSR1); + _HANDLE_SIG (SIGUSR2); +-- +2.16.2 + diff --git a/polkit.spec b/polkit.spec index c9e5f5b..1ab28a7 100644 --- a/polkit.spec +++ b/polkit.spec @@ -5,18 +5,13 @@ Summary: An authorization framework Name: polkit -Version: 0.113 -Release: 16%{?dist} +Version: 0.114 +Release: 1%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/polkit Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz Source1: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz.sign -# https://bugs.freedesktop.org/show_bug.cgi?id=99741 -Patch0: polkit-0.113-agent-leaks.patch -# https://bugs.freedesktop.org/show_bug.cgi?id=99741 -Patch1: polkit-0.113-polkitpermission-leak.patch -# already upstream -Patch2: polkit-0.113-itstool.patch +Patch0: 0001-jsauthority-pass-s-format-string-to-remaining-report.patch Group: System Environment/Libraries BuildRequires: glib2-devel >= 2.30.0 BuildRequires: expat-devel @@ -26,6 +21,7 @@ BuildRequires: intltool BuildRequires: gobject-introspection-devel BuildRequires: systemd, systemd-devel BuildRequires: mozjs17-devel +BuildRequires: git %if 0%{?enable_autoreconf} BuildRequires: autoconf @@ -94,10 +90,7 @@ Libraries files for polkit. %prep -%setup -q -%patch0 -p1 -b .agent-leaks -%patch1 -p1 -b .polkitpermission-leak -%patch2 -p1 -b .itstool +%autosetup -S git %build %if 0%{?enable_autoreconf} @@ -185,6 +178,9 @@ exit 0 %{_libdir}/girepository-1.0/*.typelib %changelog +* Tue Apr 03 2018 Ray Strode - 0.114-1 +- Update to 0.114 + * Fri Feb 09 2018 Fedora Release Engineering - 0.113-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index afa6554..37afc1d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -4b77776c9e4f897dcfe03b2c34198edf polkit-0.113.tar.gz -86b92a63394de618898b43f5722e9fe2 polkit-0.113.tar.gz.sign +SHA512 (polkit-0.114.tar.gz) = 49cdf9dd3663714b1c6569ad8740cb413d9c5bd5c11e4bdbba3ce82b744f36638b652547edff9203caab9287834bc68a1d6a4895ec7a188fa1524dc1e9c9b4ea