From 615e6dd07e621519578079d7024f0240ff2b10f4befffbfe6b2410ba747084db Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 15 Jan 2013 09:22:38 +0000 Subject: [PATCH 1/2] Accepting request 148472 from home:sumski:Base:System Update to 0.110 OBS-URL: https://build.opensuse.org/request/show/148472 OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit?expand=0&rev=85 --- polkit-0.108.tar.gz | 3 --- polkit-0.110.tar.gz | 3 +++ polkit-libmozjs.patch | 28 ---------------------------- polkit-link-gmodule.patch | 23 ----------------------- polkit.changes | 18 ++++++++++++++++++ polkit.spec | 14 ++++---------- 6 files changed, 25 insertions(+), 64 deletions(-) delete mode 100644 polkit-0.108.tar.gz create mode 100644 polkit-0.110.tar.gz delete mode 100644 polkit-libmozjs.patch delete mode 100644 polkit-link-gmodule.patch diff --git a/polkit-0.108.tar.gz b/polkit-0.108.tar.gz deleted file mode 100644 index fc184a5..0000000 --- a/polkit-0.108.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2877c15f56abe43609f6ece54ee0bfea169ca6d7b271b17296b14d751eab23a6 -size 1389367 diff --git a/polkit-0.110.tar.gz b/polkit-0.110.tar.gz new file mode 100644 index 0000000..94f1a54 --- /dev/null +++ b/polkit-0.110.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e5c5044bb968643b7fa379f287fb10582615df760ad2f1cb84be6e19fafe6e8 +size 1390215 diff --git a/polkit-libmozjs.patch b/polkit-libmozjs.patch deleted file mode 100644 index 5f05496..0000000 --- a/polkit-libmozjs.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a6747362693a91f8cfa3bd5e619cf91e2e03941b Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Thu, 15 Nov 2012 15:09:06 +0000 -Subject: Don't require libmozjs185 devel packages for polkit rules to work - -The SO-name rules for SpiderMonkey are a little bit weird and we were -opening wrong file. This problem was reported in - - https://bugs.freedesktop.org/show_bug.cgi?id=57146 - -Signed-off-by: David Zeuthen ---- -diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c -index 034edc4..e4aa46b 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.c -+++ b/src/polkitbackend/polkitbackendjsauthority.c -@@ -238,7 +238,7 @@ djs_init (PolkitBackendJsAuthority *authority) - guint n; - const gchar *library_name; - -- library_name = "libmozjs185.so"; -+ library_name = "libmozjs185.so.1.0"; - module = g_module_open (library_name, 0); - if (module == NULL) - goto out; --- -cgit v0.9.0.2-2-gbebe - diff --git a/polkit-link-gmodule.patch b/polkit-link-gmodule.patch deleted file mode 100644 index b6681d2..0000000 --- a/polkit-link-gmodule.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ca1b0cd633fb14d2e152abd7b965b02ea58f66d0 Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Wed, 14 Nov 2012 19:29:16 +0000 -Subject: Include gmodule-2.0 to avoid linker errors - -Signed-off-by: David Zeuthen ---- -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 - diff --git a/polkit.changes b/polkit.changes index 5262de4..7ed072e 100644 --- a/polkit.changes +++ b/polkit.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Jan 14 15:51:20 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to 0.110 + + Set XAUTHORITY environment variable if is unset + + Use mutex and condition variables properly + + Remove AM_PROG_CC_STDC + + Fix build on GNU Hurd + + build: Remove generated introspection files on "make clean" +- Changes from version 0.109: + + Include gmodule-2.0 to avoid linker errors + + Don't require libmozjs185 devel packages for polkit rules + to work +- Drop polkit-link-gmodule.patch and polkit-libmozjs.patch, those + are merged upstream +- polkit-no-systemd.patch and polkit-suid_flags.patch are not yet + upstreamed, so mark them as such + ------------------------------------------------------------------- Wed Jan 9 14:08:57 UTC 2013 - saschpe@suse.de diff --git a/polkit.spec b/polkit.spec index 537763a..7b6a9e9 100644 --- a/polkit.spec +++ b/polkit.spec @@ -25,7 +25,7 @@ Name: polkit Summary: PolicyKit Authorization Framework License: LGPL-2.1+ Group: System/Libraries -Version: 0.108 +Version: 0.110 Release: 0 Url: http://www.freedesktop.org/wiki/Software/PolicyKit BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,14 +33,10 @@ 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 +# PATCH-FIX-OPENSUSE 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) +# PATCH-FIX-OPENSUSE 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 -# PATCH-FIX-UPSTREAM polkit-libmozjs.patch bnc#793562 fdo#57146 dimstar@opensuse.org -- dlopen libmozjs185.so.1.0 instead of libmozjs185.so, taken from upstream git. -Patch4: polkit-libmozjs.patch # needed for patch1 BuildRequires: autoconf # needed for patch1 @@ -130,12 +126,10 @@ This package provides the GObject Introspection bindings for PolicyKit. %if !(0%{?with_systemd}) %patch2 -p1 %endif -%patch3 -p1 -%patch4 -p1 %build export V=1 -# needed for patch1 and patch3 +# needed for patch1 autoreconf -fi export SUID_CFLAGS="-fPIE" export SUID_LDFLAGS="-z now -pie" From abf2cedbb240e4b382646e1dbb0b3a41aea4bde9b9bd09620b6c267def4cfe5f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 15 Jan 2013 09:23:57 +0000 Subject: [PATCH 2/2] Accepting request 148544 from home:vuntz:branches:Base:System Fix patch tags OBS-URL: https://build.opensuse.org/request/show/148544 OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit?expand=0&rev=86 --- polkit.changes | 8 ++------ polkit.spec | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/polkit.changes b/polkit.changes index 7ed072e..c65db9d 100644 --- a/polkit.changes +++ b/polkit.changes @@ -4,17 +4,13 @@ Mon Jan 14 15:51:20 UTC 2013 - hrvoje.senjan@gmail.com - Update to 0.110 + Set XAUTHORITY environment variable if is unset + Use mutex and condition variables properly - + Remove AM_PROG_CC_STDC - + Fix build on GNU Hurd - + build: Remove generated introspection files on "make clean" + + Build fixes. - Changes from version 0.109: + Include gmodule-2.0 to avoid linker errors - + Don't require libmozjs185 devel packages for polkit rules + + Don't require libmozjs185 devel packages for polkit rules to work - Drop polkit-link-gmodule.patch and polkit-libmozjs.patch, those are merged upstream -- polkit-no-systemd.patch and polkit-suid_flags.patch are not yet - upstreamed, so mark them as such ------------------------------------------------------------------- Wed Jan 9 14:08:57 UTC 2013 - saschpe@suse.de diff --git a/polkit.spec b/polkit.spec index 7b6a9e9..3fb7d07 100644 --- a/polkit.spec +++ b/polkit.spec @@ -33,9 +33,9 @@ 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-OPENSUSE polkit-suid_flags.patch bnc#743145 fdo#46569 vuntz@opensuse.org -- Respect SUID_CFLAGS/SUID_LDFLAGS +# 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-OPENSUSE 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) +# 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 # needed for patch1 BuildRequires: autoconf