[vzctl] Updated to upstream version 4.3.1
Andrey Vagin
avagin at fedoraproject.org
Thu Jun 6 07:42:09 UTC 2013
commit bc3f141024135c2a70c471cd166e7f5b13a1b37c
Author: Andrey Vagin <avagin at openvz.org>
Date: Tue Jun 4 12:36:28 2013 +0400
Updated to upstream version 4.3.1
Signed-off-by: Andrey Vagin <avagin at openvz.org>
.gitignore | 1 +
...x-pivot_root-failure-with-mount-namespace.patch | 85 --------------------
...-upstream-to-safely-stop-container-when-s.patch | 31 -------
sources | 2 +-
vzctl.spec | 23 ++++--
5 files changed, 18 insertions(+), 124 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 131d946..5827e92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/vzctl-4.1.tar.bz2
/vzctl-4.1.1.tar.bz2
+/vzctl-4.3.1.tar.bz2
diff --git a/sources b/sources
index 8edbabe..24f45b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b22d7213c1dbe02f897b7e0b529edc5 vzctl-4.1.1.tar.bz2
+ec31b2eec92d91e26fefd5593c8fc72c vzctl-4.3.1.tar.bz2
diff --git a/vzctl.spec b/vzctl.spec
index ce810a0..840f080 100644
--- a/vzctl.spec
+++ b/vzctl.spec
@@ -8,6 +8,7 @@
%define _cachedir %{_templatedir}/cache
%define _vzctlvardir /var/lib/vzctl/
%define _veipdir %{_vzctlvardir}/veip
+%define _vepiddir %{_vzctlvardir}/vepid
%define _pkglibdir %_libexecdir/vzctl
%define _scriptdir %_pkglibdir/scripts
%define _configdir %_sysconfdir/vz
@@ -23,14 +24,12 @@
Summary: OpenVZ containers control utility
Name: vzctl
-Version: 4.1.1
-%define rel 4
+Version: 4.3.1
+%define rel 1
Release: %{rel}%{?dist}
License: GPLv2+
Group: System Environment/Kernel
Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0: 0001-vzctl-allow-upstream-to-safely-stop-container-when-s.patch
-Patch1: 0001-hooks_ct-fix-pivot_root-failure-with-mount-namespace.patch
URL: http://openvz.org/
# OpenVZ can run on its own kernel, and if that it is the case, some more
@@ -62,8 +61,6 @@ i.e. create, start, shutdown, set various options and limits etc.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" %configure \
@@ -82,6 +79,8 @@ ln -s ../vz/vz.conf $RPM_BUILD_ROOT/etc/sysconfig/vz
rm -f $RPM_BUILD_ROOT/%{_libdir}/libvzctl.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/libvzctl.so
+rm -f $RPM_BUILD_ROOT/%_libdir/libvzchown.la
+rm -f $RPM_BUILD_ROOT/%_libdir/libvzchown.so.*
# Those are binaries that either are not ported to vzctl with Upstream Linux,
# or are not applicable to that case. "make install" will copy them over, so we
# just ignore them.
@@ -92,6 +91,7 @@ rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzcpucheck
rm -f $RPM_BUILD_ROOT/%{_sbindir}/vznetcfg
rm -f $RPM_BUILD_ROOT/%{_sbindir}/vznetaddbr
rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzcalc
+rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzcptcheck
rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzpid
rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzcfgvalidate
rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzifup-post
@@ -115,6 +115,7 @@ rm -f $RPM_BUILD_ROOT/%{_scriptdir}/initd-functions
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzeventd.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzubc.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzcalc.8
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzcptcheck.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzcfgvalidate.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzcpucheck.8
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzifup-post.8
@@ -141,6 +142,7 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/
%dir %{_cachedir}
%dir %{_vzctlvardir}
%dir %{_veipdir}
+%dir %{_vepiddir}
%dir %{_configdir}
%dir %{_namesdir}
%dir %{_vpsconfdir}
@@ -153,6 +155,7 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/
%{_bashcdir}/*
%{_libdir}/libvzctl-*.so
+%{_libdir}/libvzchown*.so
%{_sbindir}/vzctl
%{_sbindir}/arpsend
%{_sbindir}/ndsend
@@ -174,6 +177,9 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/
%{_scriptdir}/vps-create
%{_scriptdir}/vps-download
%{_scriptdir}/vps-pci
+%{_scriptdir}/vps-cpt
+%{_scriptdir}/vps-rst
+%{_scriptdir}/vps-rst-env
%config %{_sysconfdir}/sysconfig/vz
%config(noreplace) %{_configdir}/vz.conf
@@ -197,6 +203,9 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/
%changelog
+* Tue Jun 4 2013 Andrew Vagin <avagin at openvz.org> - 4.3.1-1
+- Updated to upstream version 4.3.1
+
* Wed Apr 24 2013 Glauber Costa <glommer at gmail.com> - 4.1.1-4
- Include missing dependency for bridge-utils.
- Fix problems with user and pid namespaces.
@@ -222,6 +231,6 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/
- removed BUILD_ROOT cleaning in _install
- removed libxml2 dependency
-* Sun Oct 15 2012 Glauber Costa <glommer at gmail.com> - 4.0-1
+* Mon Oct 15 2012 Glauber Costa <glommer at gmail.com> - 4.0-1
- Packaged for Fedora, trying to reuse as much information as possible from
upstream package.
More information about the scm-commits
mailing list