Accepting request 179065 from Base:System
Update to 0.111 (forwarded request 179019 from sumski) OBS-URL: https://build.opensuse.org/request/show/179065 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/polkit?expand=0&rev=46
This commit is contained in:
commit
eb290bbb1e
@ -1,25 +0,0 @@
|
||||
From 7caa88f1eb8d01ab935f1d1e34a0db20f554448b Mon Sep 17 00:00:00 2001
|
||||
From: Nuno Araujo <nuno.araujo@russo79.com>
|
||||
Date: Tue, 15 Jan 2013 16:47:22 +0000
|
||||
Subject: Fix the build with automake 1.13
|
||||
|
||||
In Automake 1.13, the long-deprecated macro AM_CONFIG_HEADER (deprecated
|
||||
since 2002) has been removed in favour of AC_CONFIG_HEADERS.
|
||||
|
||||
Signed-off-by: David Zeuthen <zeuthen@gmail.com>
|
||||
---
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 40f0cd7..7d2dfcd 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
|
||||
AC_PREREQ(2.59c)
|
||||
AC_INIT(polkit, 0.110 http://lists.freedesktop.org/mailman/listinfo/polkit-devel)
|
||||
AM_INIT_AUTOMAKE(polkit, 0.110)
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8e5c5044bb968643b7fa379f287fb10582615df760ad2f1cb84be6e19fafe6e8
|
||||
size 1390215
|
3
polkit-0.111.tar.gz
Normal file
3
polkit-0.111.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:02ae544547211b687818c97bcbf19bf6b8b5be7fda93000525a8765c7bed1ea1
|
||||
size 1396389
|
@ -1,72 +0,0 @@
|
||||
commit 1d2f40178c8b3ba39c25de25530c998c3591fab8
|
||||
Author: Vincent Untz <vuntz@gnome.org>
|
||||
Date: Fri Feb 24 13:13:17 2012 +0100
|
||||
|
||||
polkitagent, pkexec: Respect SUID_CFLAGS and SUID_LDFLAGS
|
||||
|
||||
This is a good way for distributors to use -fPIE/-pie.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f4a0c41..42da974 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -459,6 +459,11 @@ AC_SUBST([GETTEXT_PACKAGE])
|
||||
AM_GLIB_GNU_GETTEXT
|
||||
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
|
||||
|
||||
+AC_ARG_VAR([SUID_CFLAGS],
|
||||
+ [CFLAGS used for binaries which are usually with the suid bit])
|
||||
+AC_ARG_VAR([SUID_LDFLAGS],
|
||||
+ [LDFLAGS used for binaries which are usually with the suid bit])
|
||||
+
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
actions/Makefile
|
||||
diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
|
||||
index e8c9fb1..f0f8419 100644
|
||||
--- a/src/polkitagent/Makefile.am
|
||||
+++ b/src/polkitagent/Makefile.am
|
||||
@@ -94,6 +94,7 @@ endif
|
||||
|
||||
polkit_agent_helper_1_CFLAGS = \
|
||||
-D_POLKIT_COMPILATION \
|
||||
+ $(SUID_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
@@ -103,6 +104,11 @@ polkit_agent_helper_1_LDADD = \
|
||||
$(top_builddir)/src/polkit/libpolkit-gobject-1.la \
|
||||
$(NULL)
|
||||
|
||||
+polkit_agent_helper_1_LDFLAGS = \
|
||||
+ $(SUID_LDFLAGS) \
|
||||
+ $(AM_LDFLAGS) \
|
||||
+ $(NULL)
|
||||
+
|
||||
if HAVE_INTROSPECTION
|
||||
|
||||
girdir = $(INTROSPECTION_GIRDIR)
|
||||
diff --git a/src/programs/Makefile.am b/src/programs/Makefile.am
|
||||
index c260dee..6aac06b 100644
|
||||
--- a/src/programs/Makefile.am
|
||||
+++ b/src/programs/Makefile.am
|
||||
@@ -24,6 +24,7 @@ bin_PROGRAMS = pkexec pkcheck pkaction
|
||||
pkexec_SOURCES = pkexec.c
|
||||
|
||||
pkexec_CFLAGS = \
|
||||
+ $(SUID_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(AUTH_LIBS) \
|
||||
$(NULL)
|
||||
@@ -34,6 +35,11 @@ pkexec_LDADD = \
|
||||
$(top_builddir)/src/polkitagent/libpolkit-agent-1.la \
|
||||
$(NULL)
|
||||
|
||||
+pkexec_LDFLAGS = \
|
||||
+ $(SUID_LDFLAGS) \
|
||||
+ $(AM_LDFLAGS) \
|
||||
+ $(NULL)
|
||||
+
|
||||
# ----------------------------------------------------------------------------------------------------
|
||||
|
||||
pkcheck_SOURCES = pkcheck.c
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 14 20:34:39 UTC 2013 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 0.111
|
||||
+ Both js185 and mozjs17 versions of SpiderMonkey are supported
|
||||
+ The JavaScript interpreter is now mandatory
|
||||
+ Fixed various memory leaks
|
||||
+ Respect SUID_CFLAGS and SUID_LDFLAGS
|
||||
+ Set process environment from pam_getenvlist()
|
||||
+ Fix the build with automake 1.13
|
||||
- Drop polkit-suid_flags.patch and automake-113.patch, those
|
||||
patches are included in this release
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 11 01:17:21 UTC 2013 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
12
polkit.spec
12
polkit.spec
@ -25,7 +25,7 @@ Name: polkit
|
||||
Summary: PolicyKit Authorization Framework
|
||||
License: LGPL-2.1+
|
||||
Group: System/Libraries
|
||||
Version: 0.110
|
||||
Version: 0.111
|
||||
Release: 0
|
||||
Url: http://www.freedesktop.org/wiki/Software/PolicyKit
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -33,12 +33,8 @@ Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{ve
|
||||
Source99: baselibs.conf
|
||||
# PATCH-FIX-OPENSUSE polkit-no-wheel-group.patch vuntz@opensuse.org -- In openSUSE, there's no special meaning for the wheel group, so we shouldn't allow it to be admin
|
||||
Patch0: polkit-no-wheel-group.patch
|
||||
# PATCH-FIX-UPSTREAM polkit-suid_flags.patch bnc#743145 fdo#46569 vuntz@opensuse.org -- Respect SUID_CFLAGS/SUID_LDFLAGS
|
||||
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 automake-113.patch -- Use AC_CONFIG_HEADERS macro instead of deprecated AM_CONFIG_HEADER, fixes build with Automake 1.13
|
||||
Patch3: automake-113.patch
|
||||
Patch1: polkit-no-systemd.patch
|
||||
# needed for patch1
|
||||
BuildRequires: autoconf
|
||||
# needed for patch1
|
||||
@ -125,11 +121,9 @@ This package provides the GObject Introspection bindings for PolicyKit.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%if !(0%{?with_systemd})
|
||||
%patch2 -p1
|
||||
%patch1 -p1
|
||||
%endif
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
export V=1
|
||||
|
Loading…
x
Reference in New Issue
Block a user