diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2014-11-20 11:49:55 +0000 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2014-11-20 11:49:55 +0000 |
| commit | 33eb0006025a96c14f2602124269f6d5712132a3 (patch) | |
| tree | 9218c46fea9b28ac6b3e05f9319a94528c539196 /app-emulation | |
| parent | Pull in a proper version of gentoo-bashcomp as extension of the bundled defau... (diff) | |
| download | gentoo-2-33eb0006025a96c14f2602124269f6d5712132a3.tar.gz gentoo-2-33eb0006025a96c14f2602124269f6d5712132a3.tar.bz2 gentoo-2-33eb0006025a96c14f2602124269f6d5712132a3.zip | |
fix firewalld configuration wrt bug #529898
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/libvirt/ChangeLog | 9 | ||||
| -rw-r--r-- | app-emulation/libvirt/files/libvirt-1.2.9-fix-firefwalld-configuration.patch | 36 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-1.2.10.ebuild | 3 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-1.2.9.1-r1.ebuild (renamed from app-emulation/libvirt/libvirt-1.2.9.1.ebuild) | 6 |
4 files changed, 50 insertions, 4 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index c04c077ccc2a..191ca130b7f5 100644 --- a/app-emulation/libvirt/ChangeLog +++ b/app-emulation/libvirt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/libvirt # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.390 2014/11/19 08:19:38 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.391 2014/11/20 11:49:55 tamiko Exp $ + +*libvirt-1.2.9.1-r1 (20 Nov 2014) + + 20 Nov 2014; Matthias Maier <tamiko@gentoo.org> + +files/libvirt-1.2.9-fix-firefwalld-configuration.patch, + +libvirt-1.2.9.1-r1.ebuild, -libvirt-1.2.9.1.ebuild, libvirt-1.2.10.ebuild: + fix firewalld configuration wrt bug #529898 19 Nov 2014; Matthias Maier <tamiko@gentoo.org> libvirt-1.2.10.ebuild, libvirt-1.2.9.1.ebuild, libvirt-9999.ebuild: diff --git a/app-emulation/libvirt/files/libvirt-1.2.9-fix-firefwalld-configuration.patch b/app-emulation/libvirt/files/libvirt-1.2.9-fix-firefwalld-configuration.patch new file mode 100644 index 000000000000..d24619f899a5 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-1.2.9-fix-firefwalld-configuration.patch @@ -0,0 +1,36 @@ +From aca0ae1faa163bbd60ee8df4b93ae870aa820746 Mon Sep 17 00:00:00 2001 +From: Eric Blake <eblake@redhat.com> +Date: Wed, 19 Nov 2014 12:13:14 -0700 +Subject: [PATCH 1/1] maint: use portable shell + +Reported in https://bugzilla.redhat.com/show_bug.cgi?id=1165827; +dash complains: + +checking for pkcheck... /usr/bin/pkcheck +checking whether pkcheck supports uid value... yes +./configure: 63906: test: xno: unexpected operator +checking for dtrace... no + +* configure.ac: Use '=' not '==' in test. + +Signed-off-by: Eric Blake <eblake@redhat.com> +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5a670eb..9fd44b2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1389,7 +1389,7 @@ AC_ARG_WITH([firewalld], + if test "x$with_firewalld" = "xcheck" ; then + with_firewalld=$with_dbus + fi +-if test "x$with_firewalld" == "xyes" ; then ++if test "x$with_firewalld" = "xyes" ; then + if test "x$with_dbus" != "xyes" ; then + AC_MSG_ERROR([You must have dbus enabled for firewalld support]) + fi +-- +1.7.1 + diff --git a/app-emulation/libvirt/libvirt-1.2.10.ebuild b/app-emulation/libvirt/libvirt-1.2.10.ebuild index ad77e2479f6c..dbb3f6bc0927 100644 --- a/app-emulation/libvirt/libvirt-1.2.10.ebuild +++ b/app-emulation/libvirt/libvirt-1.2.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.10.ebuild,v 1.3 2014/11/19 08:19:38 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.10.ebuild,v 1.4 2014/11/20 11:49:55 tamiko Exp $ EAPI=5 @@ -221,6 +221,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \ + "${FILESDIR}"/${PN}-1.2.9-fix-firefwalld-configuration.patch \ "${FILESDIR}"/${P}-cve-2014-7823.patch epatch_user diff --git a/app-emulation/libvirt/libvirt-1.2.9.1.ebuild b/app-emulation/libvirt/libvirt-1.2.9.1-r1.ebuild index 37444b180ec2..5b048bd46360 100644 --- a/app-emulation/libvirt/libvirt-1.2.9.1.ebuild +++ b/app-emulation/libvirt/libvirt-1.2.9.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.9.1.ebuild,v 1.2 2014/11/19 08:19:38 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.9.1-r1.ebuild,v 1.1 2014/11/20 11:49:55 tamiko Exp $ EAPI=5 @@ -219,7 +219,9 @@ src_prepare() { ) >.git-module-status fi - epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch + epatch \ + "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \ + "${FILESDIR}"/${PN}-1.2.9-fix-firefwalld-configuration.patch epatch_user |