first attempt at using 1.2.4

diff --git a/Makefile b/Makefile
index 7c1549b..a3ce6ff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ SHA1SUM                 := sha1sum
 # tried to download this on the fly using git archive at git://libvirt.org/libvirt.git
 # but it feels like git archive is not supported/allowed there
 ALL                     += libvirt
 # tried to download this on the fly using git archive at git://libvirt.org/libvirt.git
 # but it feels like git archive is not supported/allowed there
 ALL                     += libvirt

-libvirt-URL1           := http://mirror.onelab.eu/third-party/libvirt-1.2.3.tar.gz
-libvirt-URL2           := http://planet-lab.org/third-party/libvirt-1.2.3.tar.gz
-libvirt-SHA1SUM        := 36763621a430674312fdd08a9c367517e9a2e82e
+libvirt-URL1           := http://mirror.onelab.eu/third-party/libvirt-1.2.4.tar.gz
+libvirt-URL2           := http://planet-lab.org/third-party/libvirt-1.2.4.tar.gz
+libvirt-SHA1SUM        := e2f963a21681fdcfd393a48d8160080d9da91bc8

 libvirt                := $(notdir $(libvirt-URL1))
 
 all: $(ALL)
 libvirt                := $(notdir $(libvirt-URL1))
 
 all: $(ALL)

diff --git a/libvirt-1.2.3-bypass-netns-check.patch b/libvirt-1.2.3-bypass-netns-check.patch
deleted file mode 100644 (file)
index 8449f0c..0000000
--- a/libvirt-1.2.3-bypass-netns-check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru libvirt-1.2.3/src/lxc/lxc_driver.c libvirt-1.2.3.pl/src/lxc/lxc_driver.c
---- libvirt-1.2.3/src/lxc/lxc_driver.c 2014-03-27 11:35:01.000000000 +0100
-+++ libvirt-1.2.3.pl/src/lxc/lxc_driver.c      2014-04-08 12:25:03.000000000 +0200
-@@ -1475,9 +1475,14 @@
-     const char *argv[] = {"ip", "link", "set", "lo", "netns", "-1", NULL};
-     int ip_rc;
- 
-+    /* somehow this check fails on PL nodes
-+       most likely related to selinux as suggested in
-+       https://bugzilla.redhat.com/show_bug.cgi?id=1050210
-+       
-     if (virRun(argv, &ip_rc) < 0 ||
-         !(WIFEXITED(ip_rc) && (WEXITSTATUS(ip_rc) != 255)))
-         return 0;
-+    */
- 
-     if (lxcContainerAvailable(LXC_CONTAINER_FEATURE_NET) < 0)
-         return 0;

diff --git a/libvirt.spec b/libvirt.spec
index f0a3762..db3c0c2 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,6 +1,6 @@
 # -*- rpm-spec -*-
 
 # -*- rpm-spec -*-
 

-%define mainstream_version 1.2.3
+%define mainstream_version 1.2.4

 %define module_version_varname mainstream_version
 %define taglevel 2
 %define packager PlanetLab/OneLab
 %define module_version_varname mainstream_version
 %define taglevel 2
 %define packager PlanetLab/OneLab


@@ -432,7 +432,6 @@ URL: http://libvirt.org/
     %define mainturl stable_updates/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
     %define mainturl stable_updates/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz

-Patch1: libvirt-1.2.3-bypass-netns-check.patch

 
 %if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}
 
 %if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}


@@ -1240,7 +1239,6 @@ driver
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch1 -p1 -b .bypass-netns-check

 
 %build
 %if ! %{with_xen}
 
 %build
 %if ! %{with_xen}