rpms/polkit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

late easyfix for new release

Browse Source 
Resolves: RHEL-55287
This commit is contained in:
Jan Rybar 2024-08-22 13:52:41 +02:00
parent 22efca9921
commit 8fe91ea02e
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
polkit.spec
View File

@ -4,12 +4,13 @@
Summary: An authorization framework Summary: An authorization framework
Name: polkit Name: polkit
Version: 125 Version: 125
Release: 1%{?dist} Release: 2%{?dist}
License: LGPL-2.0-or-later License: LGPL-2.0-or-later
URL: https://github.com/polkit-org/polkit URL: https://github.com/polkit-org/polkit
Source0: https://github.com/polkit-org/polkit/archive/refs/tags/%{version}.tar.gz Source0: https://github.com/polkit-org/polkit/archive/refs/tags/%{version}.tar.gz
Source1: polkit.sysusers Source1: polkit.sysusers
Patch1: pthread_condattr_loglevel.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: glib2-devel >= 2.30.0 BuildRequires: glib2-devel >= 2.30.0
@ -162,6 +163,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/girepository-1.0/*.typelib %{_libdir}/girepository-1.0/*.typelib
%changelog %changelog
* Thu Aug 22 2024 Jan Rybar <jrybar@redhat.com> - 125-2
- late easyfix for new release
- Resolves: RHEL-55287
* Tue Aug 20 2024 Jan Rybar <jrybar@redhat.com> - 125-1 * Tue Aug 20 2024 Jan Rybar <jrybar@redhat.com> - 125-1
- rebase to polkit-125 - rebase to polkit-125
- Resolves: RHEL-55287 - Resolves: RHEL-55287

35
pthread_condattr_loglevel.patch Normal file
View File

@ -0,0 +1,35 @@
commit 13bea3e08f924002a6a5c2f275d4bf1588fc3d02
Author: Sertonix <sertonix@posteo.net>
Date: Sun Aug 11 00:26:51 2024 +0200
Fix missing arguments with HAVE_PTHREAD_CONDATTR_SETCLOCK
Fixes <64f5e4dda52> Add syslog-style log levels support
diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c
index 3e665c7..a55e1c1 100644
--- a/src/polkitbackend/polkitbackendduktapeauthority.c
+++ b/src/polkitbackend/polkitbackendduktapeauthority.c
@@ -767,12 +767,14 @@ runaway_killer_common(PolkitBackendJsAuthority *authority, RunawayKillerCtx *ctx
#ifdef HAVE_PTHREAD_CONDATTR_SETCLOCK
if ((pthread_err = pthread_condattr_init(&attr))) {
polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority),
+ LOG_LEVEL_ERROR,
"Error initializing condition variable attributes: %s",
strerror(pthread_err));
return FALSE;
}
if ((pthread_err = pthread_condattr_setclock(&attr, PK_CLOCK))) {
polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority),
+ LOG_LEVEL_ERROR,
"Error setting condition variable attributes: %s",
strerror(pthread_err));
goto err_clean_condattr;
@@ -780,6 +782,7 @@ runaway_killer_common(PolkitBackendJsAuthority *authority, RunawayKillerCtx *ctx
/* Init again, with needed attr */
if ((pthread_err = pthread_cond_init(&ctx->cond, &attr))) {
polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority),
+ LOG_LEVEL_ERROR,
"Error initializing condition variable: %s",
strerror(pthread_err));
goto err_clean_condattr;