[libvirt] [PATCH] spec: Update polkit dependencies for CVE-2013-4311
Use secured polkit on distros which provide it. However, RHEL-6 will still allow for older polkit-0.93 rather than forcing polkit-0.96-5 which is not available in all RHEL-6 releases. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- libvirt.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8d1acfa..f32ab00 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -535,7 +535,9 @@ BuildRequires: module-init-tools BuildRequires: cyrus-sasl-devel %endif %if %{with_polkit} - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 +BuildRequires: polkit-devel >= 0.112 + %elif 0%{?fedora} >= 12 || 0%{?rhel} >= 6 BuildRequires: polkit-devel >= 0.93 %else BuildRequires: PolicyKit-devel >= 0.6 @@ -698,7 +700,9 @@ Requires: avahi-libs %endif %endif %if %{with_polkit} - %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 + %if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 +Requires: polkit >= 0.112 + %elif 0%{?fedora} >= 12 || 0%{?rhel} >=6 Requires: polkit >= 0.93 %else Requires: PolicyKit >= 0.6 -- 2.0.0
On 07/15/2014 07:23 AM, Jiri Denemark wrote:
Use secured polkit on distros which provide it. However, RHEL-6 will still allow for older polkit-0.93 rather than forcing polkit-0.96-5 which is not available in all RHEL-6 releases.
Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- libvirt.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in index 8d1acfa..f32ab00 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -535,7 +535,9 @@ BuildRequires: module-init-tools BuildRequires: cyrus-sasl-devel %endif %if %{with_polkit} - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 +BuildRequires: polkit-devel >= 0.112
Fedora 20 has polkit-devel-0.112-2 - so we might as well use >= 20 in that conditional.
%if %{with_polkit} - %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 + %if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 +Requires: polkit >= 0.112
and again. ACK with that tweak. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Tue, Jul 15, 2014 at 07:56:28 -0600, Eric Blake wrote:
On 07/15/2014 07:23 AM, Jiri Denemark wrote:
Use secured polkit on distros which provide it. However, RHEL-6 will still allow for older polkit-0.93 rather than forcing polkit-0.96-5 which is not available in all RHEL-6 releases.
Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- libvirt.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in index 8d1acfa..f32ab00 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -535,7 +535,9 @@ BuildRequires: module-init-tools BuildRequires: cyrus-sasl-devel %endif %if %{with_polkit} - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 +BuildRequires: polkit-devel >= 0.112
Fedora 20 has polkit-devel-0.112-2 - so we might as well use >= 20 in that conditional.
%if %{with_polkit} - %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 + %if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 +Requires: polkit >= 0.112
and again.
ACK with that tweak.
Fixed and pushed, thanks. Jirka
On 07/15/2014 07:23 AM, Jiri Denemark wrote:
Use secured polkit on distros which provide it. However, RHEL-6 will still allow for older polkit-0.93 rather than forcing polkit-0.96-5 which is not available in all RHEL-6 releases.
Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- libvirt.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in index 8d1acfa..f32ab00 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -535,7 +535,9 @@ BuildRequires: module-init-tools BuildRequires: cyrus-sasl-devel %endif %if %{with_polkit} - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 +BuildRequires: polkit-devel >= 0.112 + %elif 0%{?fedora} >= 12 || 0%{?rhel} >= 6 BuildRequires: polkit-devel >= 0.93
Ouch - make rpm now complains: error: line 519: Unknown tag: %elif (020) || 0 >= 6 I don't think %elif is a valid spec file construct (too much shell programming for you lately?), and we have to break it into nested %if. I'll push the obvious fixup patch momentarily. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Tue, Jul 15, 2014 at 17:09:29 -0600, Eric Blake wrote:
On 07/15/2014 07:23 AM, Jiri Denemark wrote:
Use secured polkit on distros which provide it. However, RHEL-6 will still allow for older polkit-0.93 rather than forcing polkit-0.96-5 which is not available in all RHEL-6 releases.
Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- libvirt.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in index 8d1acfa..f32ab00 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -535,7 +535,9 @@ BuildRequires: module-init-tools BuildRequires: cyrus-sasl-devel %endif %if %{with_polkit} - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 +BuildRequires: polkit-devel >= 0.112 + %elif 0%{?fedora} >= 12 || 0%{?rhel} >= 6 BuildRequires: polkit-devel >= 0.93
Ouch - make rpm now complains:
error: line 519: Unknown tag: %elif (020) || 0 >= 6
I don't think %elif is a valid spec file construct (too much shell programming for you lately?)
No, I just blindly copied your suggestion and thought that trying "make rpm" even without dependencies and most features turned off would be enough to check the spec file syntax. Which was apparently wrong. Jirka
participants (2)
-
Eric Blake -
Jiri Denemark