diff --git a/.gitignore b/.gitignore index 8c14c1e..f03ed94 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ polkit-0.98.tar.gz /polkit-0.110.tar.gz /polkit-0.111.tar.gz /polkit-0.111.tar.gz.sign +/polkit-0.112.tar.gz +/polkit-0.112.tar.gz.sign diff --git a/polkit-0.112-gobject-interface-type-registration-race.patch b/polkit-0.112-gobject-interface-type-registration-race.patch deleted file mode 100644 index 0e28118..0000000 --- a/polkit-0.112-gobject-interface-type-registration-race.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 20ad116a6582e57d20f9d8197758947918753a4c Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Wed, 29 May 2013 13:45:31 +0000 -Subject: Use GOnce for interface type registration - -Static local variable may not be enough since it doesn't provide locking. - -Related to these udisksd warnings: - GLib-GObject-WARNING **: cannot register existing type `PolkitSubject' - -Thanks to Hans de Goede for spotting this! - -https://bugs.freedesktop.org/show_bug.cgi?id=65130 ---- -diff --git a/src/polkit/polkitidentity.c b/src/polkit/polkitidentity.c -index dd15b2f..7813c2c 100644 ---- a/src/polkit/polkitidentity.c -+++ b/src/polkit/polkitidentity.c -@@ -49,9 +49,9 @@ base_init (gpointer g_iface) - GType - polkit_identity_get_type (void) - { -- static GType iface_type = 0; -+ static volatile gsize g_define_type_id__volatile = 0; - -- if (iface_type == 0) -+ if (g_once_init_enter (&g_define_type_id__volatile)) - { - static const GTypeInfo info = - { -@@ -67,12 +67,14 @@ polkit_identity_get_type (void) - NULL /* value_table */ - }; - -- iface_type = g_type_register_static (G_TYPE_INTERFACE, "PolkitIdentity", &info, 0); -+ GType iface_type = -+ g_type_register_static (G_TYPE_INTERFACE, "PolkitIdentity", &info, 0); - - g_type_interface_add_prerequisite (iface_type, G_TYPE_OBJECT); -+ g_once_init_leave (&g_define_type_id__volatile, iface_type); - } - -- return iface_type; -+ return g_define_type_id__volatile; - } - - /** -diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c -index d2c4c20..aed5795 100644 ---- a/src/polkit/polkitsubject.c -+++ b/src/polkit/polkitsubject.c -@@ -50,9 +50,9 @@ base_init (gpointer g_iface) - GType - polkit_subject_get_type (void) - { -- static GType iface_type = 0; -+ static volatile gsize g_define_type_id__volatile = 0; - -- if (iface_type == 0) -+ if (g_once_init_enter (&g_define_type_id__volatile)) - { - static const GTypeInfo info = - { -@@ -68,12 +68,14 @@ polkit_subject_get_type (void) - NULL /* value_table */ - }; - -- iface_type = g_type_register_static (G_TYPE_INTERFACE, "PolkitSubject", &info, 0); -+ GType iface_type = -+ g_type_register_static (G_TYPE_INTERFACE, "PolkitSubject", &info, 0); - - g_type_interface_add_prerequisite (iface_type, G_TYPE_OBJECT); -+ g_once_init_leave (&g_define_type_id__volatile, iface_type); - } - -- return iface_type; -+ return g_define_type_id__volatile; - } - - /** -diff --git a/src/polkitbackend/polkitbackendactionlookup.c b/src/polkitbackend/polkitbackendactionlookup.c -index 5a1a228..20747e7 100644 ---- a/src/polkitbackend/polkitbackendactionlookup.c -+++ b/src/polkitbackend/polkitbackendactionlookup.c -@@ -74,9 +74,9 @@ base_init (gpointer g_iface) - GType - polkit_backend_action_lookup_get_type (void) - { -- static GType iface_type = 0; -+ static volatile gsize g_define_type_id__volatile = 0; - -- if (iface_type == 0) -+ if (g_once_init_enter (&g_define_type_id__volatile)) - { - static const GTypeInfo info = - { -@@ -92,12 +92,14 @@ polkit_backend_action_lookup_get_type (void) - NULL /* value_table */ - }; - -- iface_type = g_type_register_static (G_TYPE_INTERFACE, "PolkitBackendActionLookup", &info, 0); -+ GType iface_type = -+ g_type_register_static (G_TYPE_INTERFACE, "PolkitBackendActionLookup", &info, 0); - - g_type_interface_add_prerequisite (iface_type, G_TYPE_OBJECT); -+ g_once_init_leave (&g_define_type_id__volatile, iface_type); - } - -- return iface_type; -+ return g_define_type_id__volatile; - } - - /** --- -cgit v0.9.0.2-2-gbebe diff --git a/polkit.spec b/polkit.spec index 616e6e1..4dad7d5 100644 --- a/polkit.spec +++ b/polkit.spec @@ -5,8 +5,8 @@ Summary: An authorization framework Name: polkit -Version: 0.111 -Release: 3%{?dist} +Version: 0.112 +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 @@ -47,11 +47,6 @@ Provides: polkit-desktop-policy = 0.103 Obsoletes: polkit-js-engine < 0.110-4 Provides: polkit-js-engine = %{version}-%{release} - -# https://bugzilla.redhat.com/show_bug.cgi?id=866718 -# Use GOnce for interface type registration -Patch0: polkit-0.112-gobject-interface-type-registration-race.patch - %description polkit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged processes to speak to privileged @@ -82,7 +77,6 @@ Development documentation for polkit. %prep %setup -q -%patch0 -p1 -b .gtype-race %build %if 0%{?enable_autoreconf} @@ -169,6 +163,10 @@ exit 0 %{_datadir}/gtk-doc %changelog +* Wed Sep 18 2013 Miloslav Trmač - 0.112-1 +- Update to polkit-0.112 +- Resolves: #1009538, CVE-2013-4288 + * Sun Aug 04 2013 Fedora Release Engineering - 0.111-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 1229f60..40bd1e0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -81b116edf986d8e13502929a171f4e0d polkit-0.111.tar.gz -de0125add5cfeed20b4741c698562594 polkit-0.111.tar.gz.sign +b0f2fa00a55f47c6a5d88e9b73f80127 polkit-0.112.tar.gz +55dae3c2451345f5049693cce99b7f78 polkit-0.112.tar.gz.sign