Accepting request 141526 from Base:System
Update to 0.108 (forwarded request 141508 from dimstar) OBS-URL: https://build.opensuse.org/request/show/141526 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/polkit?expand=0&rev=39
This commit is contained in:
Ismail Dönmez
Git OBS Bridge
commit
688d0da14a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c826973db2b226dc8f807af5143f7b8be5d0270f46c0c1241a83b067db9d8311
|
||||
size 1383089
|
||||
3
polkit-0.108.tar.gz
Normal file
3
polkit-0.108.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2877c15f56abe43609f6ece54ee0bfea169ca6d7b271b17296b14d751eab23a6
|
||||
size 1389367
|
||||
23
polkit-link-gmodule.patch
Normal file
23
polkit-link-gmodule.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From ca1b0cd633fb14d2e152abd7b965b02ea58f66d0 Mon Sep 17 00:00:00 2001
|
||||
From: David Zeuthen <zeuthen@gmail.com>
|
||||
Date: Wed, 14 Nov 2012 19:29:16 +0000
|
||||
Subject: Include gmodule-2.0 to avoid linker errors
|
||||
|
||||
Signed-off-by: David Zeuthen <zeuthen@gmail.com>
|
||||
---
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ecf56f1..fefde5d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -122,7 +122,7 @@ if test "x$GCC" = "xyes"; then
|
||||
changequote([,])dnl
|
||||
fi
|
||||
|
||||
-PKG_CHECK_MODULES(GLIB, [gio-2.0 >= 2.30.0])
|
||||
+PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-2.0 >= 2.30.0])
|
||||
AC_SUBST(GLIB_CFLAGS)
|
||||
AC_SUBST(GLIB_LIBS)
|
||||
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 15 21:31:19 UTC 2012 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 0.108:
|
||||
+ PolkitAgent: Avoid crashing if initializing the server object
|
||||
fails
|
||||
+ Fall back to authenticating as uid 0 if the list of admin
|
||||
identities is empty
|
||||
+ Dynamically load libmozjs185.so and cope with it not being
|
||||
available
|
||||
+ docs: mention the audience for authorization rules
|
||||
+ build: Fix .gir generation for parallel make
|
||||
- Only conditionally Require ConsoleKit when with_systemd is 0:
|
||||
systemd support obsoletes ConsoleKit.
|
||||
- Add polkit-link-gmodule.patch: Link against gmodule-2.0.
|
||||
- Change libpolkit0 to require polkit >= %version instead of the
|
||||
exact version. This will ease upgrade problems should there ever
|
||||
be a soname bump of libpolkit0.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 14 09:26:14 UTC 2012 - dimstar@opensuse.org
|
||||
|
||||
- Enable systemd inetegration (change with_systemd to 1): As an
|
||||
agreed target for 12.3, systemd integration will be enabled.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 8 21:34:15 UTC 2012 - aj@suse.de
|
||||
|
||||
|
||||
38
polkit.spec
38
polkit.spec
@ -16,13 +16,16 @@
|
||||
#
|
||||
|
||||
|
||||
%define with_systemd 0
|
||||
%define with_systemd 1
|
||||
%if 0%{with_systemd}
|
||||
%define systemdsystemunitdir %(pkg-config --variable systemdsystemunitdir systemd)
|
||||
%endif
|
||||
|
||||
Name: polkit
|
||||
Summary: PolicyKit Authorization Framework
|
||||
License: LGPL-2.1+
|
||||
Group: System/Libraries
|
||||
Version: 0.107
|
||||
Version: 0.108
|
||||
Release: 0
|
||||
Url: http://www.freedesktop.org/wiki/Software/PolicyKit
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -34,6 +37,8 @@ Patch0: polkit-no-wheel-group.patch
|
||||
Patch1: polkit-suid_flags.patch
|
||||
# PATCH-FIX-UPSTREAM polkit-no-systemd.patch bnc#782395 fdo#55377 vuntz@opensuse.org -- Do not reference non-existing polkit.service file for systemd (only applied if not built with systemd support)
|
||||
Patch2: polkit-no-systemd.patch
|
||||
# PATCH-FIX-UPSTREAM polkit-link-gmodule.patch dimstar@opensuse.org -- Link against gmodule-2.0. Patch taken from upstream git.
|
||||
Patch3: polkit-link-gmodule.patch
|
||||
# needed for patch1
|
||||
BuildRequires: autoconf
|
||||
# needed for patch1
|
||||
@ -45,7 +50,7 @@ BuildRequires: gtk-doc
|
||||
#!BuildIgnore: ruby
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libexpat-devel
|
||||
# needed for patch1
|
||||
# needed for patch1 and patch3
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pam-devel
|
||||
%if 0%{?with_systemd}
|
||||
@ -53,9 +58,14 @@ BuildRequires: systemd-devel
|
||||
%endif
|
||||
BuildRequires: pkgconfig(mozjs185)
|
||||
PreReq: permissions pwdutils
|
||||
%if ! %{with_systemd}
|
||||
Requires: ConsoleKit
|
||||
%endif
|
||||
Requires: dbus-1
|
||||
Requires: libpolkit0 = %{version}-%{release}
|
||||
%if %{with_systemd}
|
||||
%systemd_requires
|
||||
%endif
|
||||
|
||||
# Upstream First - Policy:
|
||||
# Never add any patches to this package without the upstream commit id
|
||||
@ -91,7 +101,7 @@ Development documentation for PolicyKit Authorization Framework.
|
||||
%package -n libpolkit0
|
||||
Summary: PolicyKit Authorization Framework -- Libraries
|
||||
Group: System/Libraries
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} >= %{version}
|
||||
|
||||
%description -n libpolkit0
|
||||
PolicyKit is a toolkit for defining and handling authorizations.
|
||||
@ -118,10 +128,11 @@ This package provides the GObject Introspection bindings for PolicyKit.
|
||||
%if !(0%{?with_systemd})
|
||||
%patch2 -p1
|
||||
%endif
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
export V=1
|
||||
# needed for patch1
|
||||
# needed for patch1 and patch3
|
||||
autoreconf -fi
|
||||
export SUID_CFLAGS="-fPIE"
|
||||
export SUID_LDFLAGS="-z now -pie"
|
||||
@ -153,11 +164,25 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%pre
|
||||
getent group polkitd > /dev/null || groupadd -r polkitd
|
||||
getent passwd polkitd > /dev/null || useradd -r -g polkitd -d %{_localstatedir}/lib/polkit -s /sbin/nologin -c "User for polkitd" polkitd
|
||||
%if %{with_systemd}
|
||||
%service_add_pre polkit.service
|
||||
%endif
|
||||
exit 0
|
||||
|
||||
%if %{with_systemd}
|
||||
%preun
|
||||
%service_del_preun polkit.service
|
||||
|
||||
%postun
|
||||
%service_del_postun polkit.service
|
||||
%endif
|
||||
|
||||
%post
|
||||
%set_permissions %{_bindir}/pkexec
|
||||
%set_permissions %{_prefix}/lib/polkit-1/polkit-agent-helper-1
|
||||
%if %{with_systemd}
|
||||
%service_add_post polkit.service
|
||||
%endif
|
||||
|
||||
%verifyscript
|
||||
%verify_permissions -e %{_bindir}/pkexec
|
||||
@ -209,6 +234,9 @@ exit 0
|
||||
%verify(not mode) %attr(4755,root,root) %{_prefix}/lib/polkit-1/polkit-agent-helper-1
|
||||
# $HOME for polkit user
|
||||
%dir %{_localstatedir}/lib/polkit
|
||||
%if %{with_systemd}
|
||||
%{systemdsystemunitdir}/polkit.service
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user