[vzctl/f18: 1/2] Fix compilation on architectures without support for VZ (rhbz 971821)

[Andrey Vagin]

commit afdb9e4fe801f338ded09984ce56ea036de8c154
Author: Andrey Vagin <avagin at openvz.org>
Date:   Fri Jun 7 02:00:31 2013 +0400

    Fix compilation on architectures without support for VZ (rhbz 971821)
    
    Signed-off-by: Andrey Vagin <avagin at openvz.org>

 ...tion-on-architectures-without-support-for.patch |   29 ++++++++++++++++++++
 vzctl.spec                                         |    7 ++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-compilation-on-architectures-without-support-for.patch b/0001-Fix-compilation-on-architectures-without-support-for.patch
new file mode 100644
index 0000000..271e8d2
--- /dev/null
+++ b/0001-Fix-compilation-on-architectures-without-support-for.patch
@@ -0,0 +1,29 @@
+From b2a4926e26ca7f0dd644485e137068a4310a2cd5 Mon Sep 17 00:00:00 2001
+From: Andrey Vagin <avagin at openvz.org>
+Date: Fri, 7 Jun 2013 01:23:02 +0400
+Subject: [PATCH] Fix compilation on architectures without support for VZ
+
+https://bugzilla.redhat.com/show_bug.cgi?id=971821
+
+Signed-off-by: Andrey Vagin <avagin at openvz.org>
+---
+ src/lib/cpt.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/lib/cpt.c b/src/lib/cpt.c
+index d4fb7c0..01649ec 100644
+--- a/src/lib/cpt.c
++++ b/src/lib/cpt.c
+@@ -39,6 +39,9 @@
+ #include "logger.h"
+ #include "util.h"
+ 
++extern void clean_hardlink_dir(const char *mntdir) __attribute__((weak));
++void clean_hardlink_dir(const char *mntdir) {}
++
+ int cpt_cmd(vps_handler *h, envid_t veid, const char *root,
+ 		int action, int cmd, unsigned int ctx)
+ {
+-- 
+1.8.2
+
diff --git a/vzctl.spec b/vzctl.spec
index f476ff3..bbfcee8 100644
--- a/vzctl.spec
+++ b/vzctl.spec
@@ -25,12 +25,13 @@
 Summary: OpenVZ containers control utility
 Name: vzctl
 Version: 4.3.1
-%define rel 2
+%define rel 3
 Release: %{rel}%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
 Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0: 0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch
+Patch1: 0001-Fix-compilation-on-architectures-without-support-for.patch
 URL: http://openvz.org/
 
 # OpenVZ can run on its own kernel, and if that it is the case, some more
@@ -64,6 +65,7 @@ i.e. create, start, shutdown, set various options and limits etc.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %configure \
@@ -206,6 +208,9 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/
 
 
 %changelog
+* Fri Jun 7 2013 Andrey Vagin <avagin at gmail.com> - 4.3.1-3
+- Fix compilation on architectures without support for VZ (rhbz 971821)
+
 * Thu Jun 6 2013 Andrey Vagin <avagin at gmail.com> - 4.3.1-2
 - Include missing dependency for gnugpg.