diff --git a/0001-Disable-use-of-namespaces-by-default.patch b/0001-Disable-use-of-namespaces-by-default.patch
new file mode 100644
index 0000000..2bcf334
--- /dev/null
+++ b/0001-Disable-use-of-namespaces-by-default.patch
@@ -0,0 +1,34 @@
+From ec9c065d405a129d3d33abd3d10d8a7ff1a49420 Mon Sep 17 00:00:00 2001
+From: "Daniel P. Berrange" <berrange@redhat.com>
+Date: Wed, 18 Jan 2017 10:48:12 +0000
+Subject: [PATCH] Disable use of namespaces by default
+
+When namespaces are enabled there is currently breakage when
+using disk hotplug and when using AppArmor
+
+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
+---
+ src/qemu/qemu_conf.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index 6613d59..aa05b46 100644
+--- a/src/qemu/qemu_conf.c
++++ b/src/qemu/qemu_conf.c
+@@ -317,13 +317,6 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)
+ if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST)))
+ goto error;
+
+-#if defined(__linux__)
+- if (privileged &&
+- virProcessNamespaceAvailable(VIR_PROCESS_NAMESPACE_MNT) == 0 &&
+- virBitmapSetBit(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) < 0)
+- goto error;
+-#endif /* defined(__linux__) */
+-
+ #ifdef DEFAULT_LOADER_NVRAM
+ if (virFirmwareParseList(DEFAULT_LOADER_NVRAM,
+ &cfg->firmwares,
+--
+2.9.3
+
diff --git a/0001-tests-blacklist-gnutls-3.5.6-for-wildcard-tests.patch b/0001-tests-blacklist-gnutls-3.5.6-for-wildcard-tests.patch
deleted file mode 100644
index d2e72af..0000000
--- a/0001-tests-blacklist-gnutls-3.5.6-for-wildcard-tests.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 93c2b9d2f01e878ed86566620130089aba61580f Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Mon, 5 Dec 2016 11:47:04 +0000
-Subject: [PATCH] tests: blacklist gnutls 3.5.6 for wildcard tests
-
-GNUTLS 3.5.6 broke wildcard support by reversing the
-fields in the reported dname. This regression will
-be fixed in 3.5.7, so rather than workaround it in
-libvirt we just blacklist that version
-
- https://lists.gnupg.org/pipermail/gnutls-devel/2016-November/008224.html
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- tests/virnettlssessiontest.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c
-index 0d2e106..b146072 100644
---- a/tests/virnettlssessiontest.c
-+++ b/tests/virnettlssessiontest.c
-@@ -374,6 +374,14 @@ mymain(void)
- DO_SESS_TEST(cacertreq.filename, servercertalt2req.filename, clientcertreq.filename,
- false, false, "wiki.libvirt.org", NULL);
-
-+#if GNUTLS_VERSION_NUMBER != 0x030506
-+ /*
-+ * GNUTLS 3.5.6 broke wildcard support by reversing the
-+ * fields in the reported dname. This regression will
-+ * be fixed in 3.5.7, so rather than workaround it in
-+ * libvirt we just blacklist that version
-+ * https://lists.gnupg.org/pipermail/gnutls-devel/2016-November/008224.html
-+ */
- const char *const wildcards1[] = {
- "C=UK,CN=dogfood",
- NULL,
-@@ -412,6 +420,7 @@ mymain(void)
- false, false, "libvirt.org", wildcards5);
- DO_SESS_TEST(cacertreq.filename, servercertreq.filename, clientcertreq.filename,
- false, false, "libvirt.org", wildcards6);
-+#endif
-
- TLS_ROOT_REQ(cacertrootreq,
- "UK", "libvirt root", NULL, NULL, NULL, NULL,
---
-2.9.3
-
diff --git a/libvirt.spec b/libvirt.spec
index 2a9c79b..b1a7edd 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -226,8 +226,8 @@
Summary: Library providing a simple virtualization API
Name: libvirt
-Version: 2.5.0
-Release: 3%{?dist}%{?extra_release}
+Version: 3.0.0
+Release: 1%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -237,10 +237,9 @@ URL: http://libvirt.org/
%define mainturl stable_updates/
%endif
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz
-# Temporarily disable wildcard tests due to gnutls 3.5.6
-# regression. Remove when gnutls 3.5.7 arrives
-# https://bugzilla.redhat.com/show_bug.cgi?id=1394318
-Patch1: 0001-tests-blacklist-gnutls-3.5.6-for-wildcard-tests.patch
+# Temporarily disable namespaces due to various regressions
+# they cause
+Patch1: 0001-Disable-use-of-namespaces-by-default.patch
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -1849,6 +1848,8 @@ exit 0
%{_datadir}/libvirt/cpu_map.xml
+%{_datadir}/libvirt/test-screenshot.png
+
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
%files admin
@@ -1863,6 +1864,7 @@ exit 0
%files nss
%{_libdir}/libnss_libvirt.so.2
+%{_libdir}/libnss_libvirt_guest.so.2
%if %{with_lxc}
%files login-shell
@@ -1909,6 +1911,9 @@ exit 0
%changelog
+* Thu Jan 19 2017 Daniel P. Berrange <berrange@redhat.com> - 3.0.0-1
+- Rebase to version 3.0.0
+
* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 2.5.0-3
- Rebuild for readline 7.x
diff --git a/sources b/sources
index dd51ba5..066b648 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-001af1ca2545971c6b46628678fd4afa libvirt-2.5.0.tar.xz
+SHA512 (libvirt-3.0.0.tar.xz) = 58c65dafd134fd72eb4f71c65a29180bd68bc75f219999c16f41f74fbc72aefa1cd85a89ca8f334d854ab298936db24606dcc4f61319d05a0931cc4e5f8680ff