Rebased to polkit-0.117
This commit is contained in:
parent
f6ba446930
commit
32cbffd8b3
2
.gitignore
vendored
2
.gitignore
vendored
@ -30,3 +30,5 @@ polkit-0.98.tar.gz
|
||||
/polkit-0.115.tar.gz.sign
|
||||
/polkit-0.116.tar.gz
|
||||
/polkit-0.116.tar.gz.sign
|
||||
/polkit-0.117.tar.gz
|
||||
/polkit-0.117.tar.gz.sign
|
||||
|
@ -1,19 +0,0 @@
|
||||
commit 28e3a6653d8c3777b07e0128a0d97d46e586e311
|
||||
Author: Jan Rybar <jrybar@redhat.com>
|
||||
Date: Tue Oct 8 13:28:18 2019 +0000
|
||||
|
||||
jsauthority: Fix two minor memory leaks
|
||||
|
||||
diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp
|
||||
index 9b752d1..e97b8aa 100644
|
||||
--- a/src/polkitbackend/polkitbackendjsauthority.cpp
|
||||
+++ b/src/polkitbackend/polkitbackendjsauthority.cpp
|
||||
@@ -567,6 +567,8 @@ polkit_backend_js_authority_finalize (GObject *object)
|
||||
g_strfreev (authority->priv->rules_dirs);
|
||||
|
||||
delete authority->priv->ac;
|
||||
+ delete authority->priv->js_global;
|
||||
+ delete authority->priv->js_polkit;
|
||||
|
||||
JS_DestroyContext (authority->priv->cx);
|
||||
/* JS_ShutDown (); */
|
@ -1,12 +0,0 @@
|
||||
diff -up ./src/programs/pkttyagent.c.ori ./src/programs/pkttyagent.c
|
||||
--- ./src/programs/pkttyagent.c.ori 2019-09-27 16:52:24.377434038 +0200
|
||||
+++ ./src/programs/pkttyagent.c 2019-09-27 16:53:01.743875350 +0200
|
||||
@@ -56,7 +56,7 @@ static void tty_handler(int signal)
|
||||
|
||||
if (tty_flags_saved)
|
||||
{
|
||||
- tcsetattr (fileno (tty), TCSAFLUSH, &ts);
|
||||
+ tcsetattr (fileno (tty), TCSADRAIN, &ts);
|
||||
}
|
||||
|
||||
kill(getpid(), signal);
|
@ -1,30 +0,0 @@
|
||||
From 76aae4fce586b400f5fe08df31497db19d624609 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Rybar <jrybar@redhat.com>
|
||||
Date: Thu, 1 Aug 2019 06:46:10 +0000
|
||||
Subject: [PATCH] pkttyagent: process stopped by SIGTTOU if run in background
|
||||
job
|
||||
|
||||
---
|
||||
src/programs/pkttyagent.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/programs/pkttyagent.c b/src/programs/pkttyagent.c
|
||||
index 3c8d502..13879a2 100644
|
||||
--- a/src/programs/pkttyagent.c
|
||||
+++ b/src/programs/pkttyagent.c
|
||||
@@ -264,6 +264,12 @@ main (int argc, char *argv[])
|
||||
|
||||
memset (&sa, 0, sizeof (sa));
|
||||
sa.sa_handler = &tty_handler;
|
||||
+/* If tty_handler() resets terminal while pkttyagent is run in background job,
|
||||
+ the process gets stopped by SIGTTOU. This impacts systemctl, hence it must
|
||||
+ be blocked for a while and then the process gets killed anyway.
|
||||
+ */
|
||||
+ sigemptyset(&sa.sa_mask);
|
||||
+ sigaddset(&sa.sa_mask, SIGTTOU);
|
||||
sigaction (SIGTERM, &sa, &savesigterm);
|
||||
sigaction (SIGINT, &sa, &savesigint);
|
||||
sigaction (SIGTSTP, &sa, &savesigtstp);
|
||||
--
|
||||
2.20.1
|
||||
|
12
polkit.spec
12
polkit.spec
@ -5,16 +5,13 @@
|
||||
|
||||
Summary: An authorization framework
|
||||
Name: polkit
|
||||
Version: 0.116
|
||||
Release: 9%{?dist}
|
||||
Version: 0.117
|
||||
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
|
||||
|
||||
Patch1: polkit-0.116-pkttyagent-sigttou-bg-job.patch
|
||||
Patch2: pkttyagent-tcsaflush-batch-erase.patch
|
||||
Patch3: jsauthority-memleak.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: glib2-devel >= 2.30.0
|
||||
@ -24,7 +21,7 @@ BuildRequires: gtk-doc
|
||||
BuildRequires: intltool
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: systemd, systemd-devel
|
||||
BuildRequires: pkgconfig(mozjs-60)
|
||||
BuildRequires: pkgconfig(mozjs-68)
|
||||
BuildRequires: git
|
||||
|
||||
%if 0%{?enable_autoreconf}
|
||||
@ -178,6 +175,9 @@ exit 0
|
||||
%{_libdir}/girepository-1.0/*.typelib
|
||||
|
||||
%changelog
|
||||
* Fri Jul 31 2020 Jan Rybar <jrybar@redhat.com> - 0.117-1
|
||||
- Rebased to polkit-0.117
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.116-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (polkit-0.116.tar.gz) = b66b01cc2bb4349de70147f41f161f0f6f41e7230b581dfb054058b48969ec57041ab05b51787c749ccfc36aa5f317952d7e7ba337b4f6f6c0a923ed5866c2d5
|
||||
SHA512 (polkit-0.116.tar.gz.sign) = f3721461d3ddfdcd9b22458ebce54f42a6db763d684b2369d961430bd4000eed0a610d2df361a54e2d3b2c5656fbd94f48ce5a0bc071e4641667b80d998bb730
|
||||
SHA512 (polkit-0.117.tar.gz) = c10ea984f2386fe436e58a2866e5323afc80d24f744f0ee61d966941259aa491bd96b07d911434aa731b300c3cca25b647804b396501175ab5b3c53384e94c70
|
||||
SHA512 (polkit-0.117.tar.gz.sign) = 4f050d585317f000a8f7b2f54a4fd028e4be3ace2a5080277c160878641e851c297e4d275b3462fc43d6ef6feb1706f0c4c4dacf868655ea67528e1d237899d7
|
||||
|
Loading…
Reference in New Issue
Block a user