From 48a27e741dc690ded82b4b46fb21438f1c7d9861 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 11 Dec 2012 12:39:47 +0400 Subject: [PATCH 01/39] fix #878416 - build OpenVZ in secondary architectures. The minor update from vzctl-4.1 to vzctl-4.1.1 fixes this. Since it is a minor realease, let's just update instead of carrying the patch --- vzctl.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vzctl.spec b/vzctl.spec index 09744dd..de3ac6c 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -23,8 +23,8 @@ Summary: OpenVZ containers control utility Name: vzctl -Version: 4.1 -%define rel 2 +Version: 4.1.1 +%define rel 3 Release: %{rel}%{?dist} License: GPLv2+ Group: System Environment/Kernel @@ -192,6 +192,10 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/ %changelog +* Tue Dec 11 2012 Glauber Costa - 4.1.1-3 +- Build on all architectures, fixes #878416. OpenVZ 4.1.1 handles + that, so we don't need to carry a patch. + * Thu Nov 15 2012 Glauber Costa - 4.1-2 - Corrected license: GPLv2 -> GPLv2+, which is what the sources actually claim - Fixed ownership problems with directories _vzdir/template/ and /var/lib/vzctl/ From 99d89e42a4b7b11c49046cd3797466eafac35d28 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 11 Dec 2012 12:39:47 +0400 Subject: [PATCH 02/39] fix #878416 - build OpenVZ in secondary architectures. The minor update from vzctl-4.1 to vzctl-4.1.1 fixes this. Since it is a minor realease, let's just update instead of carrying the patch --- vzctl.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vzctl.spec b/vzctl.spec index 09744dd..de3ac6c 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -23,8 +23,8 @@ Summary: OpenVZ containers control utility Name: vzctl -Version: 4.1 -%define rel 2 +Version: 4.1.1 +%define rel 3 Release: %{rel}%{?dist} License: GPLv2+ Group: System Environment/Kernel @@ -192,6 +192,10 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/ %changelog +* Tue Dec 11 2012 Glauber Costa - 4.1.1-3 +- Build on all architectures, fixes #878416. OpenVZ 4.1.1 handles + that, so we don't need to carry a patch. + * Thu Nov 15 2012 Glauber Costa - 4.1-2 - Corrected license: GPLv2 -> GPLv2+, which is what the sources actually claim - Fixed ownership problems with directories _vzdir/template/ and /var/lib/vzctl/ From e3b3756b7de36fd5221dd939620431a93dc442d2 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 11 Dec 2012 12:59:48 +0400 Subject: [PATCH 03/39] commiting to sources file for #878416 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a649984..131d946 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /vzctl-4.1.tar.bz2 +/vzctl-4.1.1.tar.bz2 diff --git a/sources b/sources index e438714..8edbabe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6cb0072890fa30864586b6033b640441 vzctl-4.1.tar.bz2 +1b22d7213c1dbe02f897b7e0b529edc5 vzctl-4.1.1.tar.bz2 From 300af307619718b3588699de13c92008479af9f4 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 11 Dec 2012 12:59:48 +0400 Subject: [PATCH 04/39] commiting to sources file for #878416 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a649984..131d946 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /vzctl-4.1.tar.bz2 +/vzctl-4.1.1.tar.bz2 diff --git a/sources b/sources index e438714..8edbabe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6cb0072890fa30864586b6033b640441 vzctl-4.1.tar.bz2 +1b22d7213c1dbe02f897b7e0b529edc5 vzctl-4.1.1.tar.bz2 From dda2d55baf8e422cf4be062c2f3df01b67ce4fa4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:56:23 -0600 Subject: [PATCH 05/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index de3ac6c..8f4e5ce 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.1.1 %define rel 3 -Release: %{rel}%{?dist} +Release: %{rel}%{?dist}.1 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -192,6 +192,9 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/ %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 4.1.1-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Tue Dec 11 2012 Glauber Costa - 4.1.1-3 - Build on all architectures, fixes #878416. OpenVZ 4.1.1 handles that, so we don't need to carry a patch. From 16d3e9e7fd753bc3a773f9bf87e4169ef0e0a350 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Wed, 24 Apr 2013 18:26:24 +0400 Subject: [PATCH 06/39] Initial fixes for F19. Mostly discovered by internal testing, so no BZ Signed-off-by: Glauber Costa --- ...ot_root-failure-with-mount-namespace.patch | 85 +++++++++++++++++++ ...ream-to-safely-stop-container-when-s.patch | 31 +++++++ vzctl.spec | 13 ++- 3 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 0001-hooks_ct-fix-pivot_root-failure-with-mount-namespace.patch create mode 100644 0001-vzctl-allow-upstream-to-safely-stop-container-when-s.patch diff --git a/0001-hooks_ct-fix-pivot_root-failure-with-mount-namespace.patch b/0001-hooks_ct-fix-pivot_root-failure-with-mount-namespace.patch new file mode 100644 index 0000000..e63ef90 --- /dev/null +++ b/0001-hooks_ct-fix-pivot_root-failure-with-mount-namespace.patch @@ -0,0 +1,85 @@ +From 571b8b894030653805689fdd6e4b91f54a75598b Mon Sep 17 00:00:00 2001 +From: Glauber Costa +Date: Tue, 26 Feb 2013 07:40:37 +0400 +Subject: [PATCH] hooks_ct: fix pivot_root failure with mount namespaces. + +Not only we don't need to call pivot_root when joining a mount namespace, we +can't do it. This is because the filesystem we currently are will become +invisible after we join the mount namespace. As a side effect, we are fully +protected because we will only have the filesystem view of the newly joined +namespace. + +Because setns support for mount namespaces are not always present, we need +a flag do determine whether or not we've joined it. And because this is not +needed outside this scope at all, we can resort to a local only flag instead +of storing this information in the vps_handler + +Signed-off-by: Glauber Costa +--- + src/lib/hooks_ct.c | 32 +++++++++++++++++--------------- + 1 file changed, 17 insertions(+), 15 deletions(-) + +Index: vzctl-4.1.1/src/lib/hooks_ct.c +=================================================================== +--- vzctl-4.1.1.orig/src/lib/hooks_ct.c ++++ vzctl-4.1.1/src/lib/hooks_ct.c +@@ -213,13 +213,14 @@ static int ct_env_create(struct arg_star + return 0; + } + +-static int __ct_enter(vps_handler *h, envid_t veid, int flags) ++static int ct_enter(vps_handler *h, envid_t veid, const char *root, int flags) + { + DIR *dp; + struct dirent *ep; + char path[STR_SIZE]; /* long enough for any pid */ + pid_t task_pid; + int ret = VZ_RESOURCE_ERROR; ++ bool joined_mnt_ns = false; + + if (!h->can_join_pidns) { + logger(-1, 0, "Kernel lacks setns for pid namespace"); +@@ -253,7 +254,22 @@ static int __ct_enter(vps_handler *h, en + goto out; + if (setns(fd, 0)) + logger(-1, errno, "Failed to set context for %s", ep->d_name); ++ ++ if (!strcmp(ep->d_name, "mnt")) ++ joined_mnt_ns = true; + } ++ ++ /* ++ * If we can join the mount namespace, we don't need to call ++ * pivot_root, or any other follow up step, since we will already ++ * inherit any fs tree structure the process already has. ++ * ++ * As a matter of fact, we won't even be able to see the container ++ * directories to jump to ++ */ ++ if (!joined_mnt_ns && (ret = ct_chroot(root))) ++ return ret; ++ + ret = 0; + + if ((ret = container_add_task(veid))) { +@@ -265,20 +281,6 @@ out: + return ret; + } + +-/* +- * We need to do chroot only after the context is set. Otherwise, we can't find the proc files +- * we need to operate on the ns files +- */ +-static int ct_enter(vps_handler *h, envid_t veid, const char *root, int flags) +-{ +- int ret; +- if ((ret = __ct_enter(h, veid, flags))) +- return ret; +- if ((ret = ct_chroot(root))) +- return ret; +- return 0; +-} +- + #define add_value(val, var, mult) do { if (val) { var = *val * mult; } } while (0) + + static int ct_setlimits(vps_handler *h, envid_t veid, struct ub_struct *ub) diff --git a/0001-vzctl-allow-upstream-to-safely-stop-container-when-s.patch b/0001-vzctl-allow-upstream-to-safely-stop-container-when-s.patch new file mode 100644 index 0000000..ffff9c0 --- /dev/null +++ b/0001-vzctl-allow-upstream-to-safely-stop-container-when-s.patch @@ -0,0 +1,31 @@ +From 664cb6e123582e7e532adc72ee1a947da7b0d38b Mon Sep 17 00:00:00 2001 +From: Glauber Costa +Date: Tue, 26 Feb 2013 07:40:36 +0400 +Subject: [PATCH] vzctl: allow upstream to safely stop container when setns is + available + +The test preventing the execution of in-container reboot right now just +checks whether or not we are running an upstream Linux Kernel. However, +it is perfectly possible to gracefuly stop the container if joining the +pid namespace is possible. + +Update the test to reflect that. + +Signed-off-by: Glauber Costa +--- + src/lib/env.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: vzctl-4.1.1/src/lib/env.c +=================================================================== +--- vzctl-4.1.1.orig/src/lib/env.c ++++ vzctl-4.1.1/src/lib/env.c +@@ -790,7 +790,7 @@ static int env_stop(vps_handler *h, envi + if (stop_mode == M_KILL) + goto kill_vps; + +- if (!is_vz_kernel(h)) { ++ if (!is_vz_kernel(h) && !h->can_join_pidns) { + logger(-1, 0, "Due to lack of proper support in this kernel, " + "container can't be cleanly\n" + "stopped from the host system. Please stop it from inside, " diff --git a/vzctl.spec b/vzctl.spec index 8f4e5ce..ce810a0 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -24,11 +24,13 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.1.1 -%define rel 3 -Release: %{rel}%{?dist}.1 +%define rel 4 +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 @@ -46,6 +48,7 @@ Requires: sed Requires: grep # requires for bash_completion and vps-download Requires: wget +Requires: bridge-utils BuildRequires: libcgroup-devel >= 0.38 @@ -59,6 +62,8 @@ i.e. create, start, shutdown, set various options and limits etc. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build CFLAGS="$RPM_OPT_FLAGS" %configure \ @@ -192,6 +197,10 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/ %changelog +* Wed Apr 24 2013 Glauber Costa - 4.1.1-4 +- Include missing dependency for bridge-utils. +- Fix problems with user and pid namespaces. + * Fri Feb 15 2013 Fedora Release Engineering - 4.1.1-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From bc3f141024135c2a70c471cd166e7f5b13a1b37c Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Tue, 4 Jun 2013 12:36:28 +0400 Subject: [PATCH 07/39] Updated to upstream version 4.3.1 Signed-off-by: Andrey Vagin --- .gitignore | 1 + ...ot_root-failure-with-mount-namespace.patch | 85 ------------------- ...ream-to-safely-stop-container-when-s.patch | 31 ------- sources | 2 +- vzctl.spec | 23 +++-- 5 files changed, 18 insertions(+), 124 deletions(-) delete mode 100644 0001-hooks_ct-fix-pivot_root-failure-with-mount-namespace.patch delete mode 100644 0001-vzctl-allow-upstream-to-safely-stop-container-when-s.patch 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/0001-hooks_ct-fix-pivot_root-failure-with-mount-namespace.patch b/0001-hooks_ct-fix-pivot_root-failure-with-mount-namespace.patch deleted file mode 100644 index e63ef90..0000000 --- a/0001-hooks_ct-fix-pivot_root-failure-with-mount-namespace.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 571b8b894030653805689fdd6e4b91f54a75598b Mon Sep 17 00:00:00 2001 -From: Glauber Costa -Date: Tue, 26 Feb 2013 07:40:37 +0400 -Subject: [PATCH] hooks_ct: fix pivot_root failure with mount namespaces. - -Not only we don't need to call pivot_root when joining a mount namespace, we -can't do it. This is because the filesystem we currently are will become -invisible after we join the mount namespace. As a side effect, we are fully -protected because we will only have the filesystem view of the newly joined -namespace. - -Because setns support for mount namespaces are not always present, we need -a flag do determine whether or not we've joined it. And because this is not -needed outside this scope at all, we can resort to a local only flag instead -of storing this information in the vps_handler - -Signed-off-by: Glauber Costa ---- - src/lib/hooks_ct.c | 32 +++++++++++++++++--------------- - 1 file changed, 17 insertions(+), 15 deletions(-) - -Index: vzctl-4.1.1/src/lib/hooks_ct.c -=================================================================== ---- vzctl-4.1.1.orig/src/lib/hooks_ct.c -+++ vzctl-4.1.1/src/lib/hooks_ct.c -@@ -213,13 +213,14 @@ static int ct_env_create(struct arg_star - return 0; - } - --static int __ct_enter(vps_handler *h, envid_t veid, int flags) -+static int ct_enter(vps_handler *h, envid_t veid, const char *root, int flags) - { - DIR *dp; - struct dirent *ep; - char path[STR_SIZE]; /* long enough for any pid */ - pid_t task_pid; - int ret = VZ_RESOURCE_ERROR; -+ bool joined_mnt_ns = false; - - if (!h->can_join_pidns) { - logger(-1, 0, "Kernel lacks setns for pid namespace"); -@@ -253,7 +254,22 @@ static int __ct_enter(vps_handler *h, en - goto out; - if (setns(fd, 0)) - logger(-1, errno, "Failed to set context for %s", ep->d_name); -+ -+ if (!strcmp(ep->d_name, "mnt")) -+ joined_mnt_ns = true; - } -+ -+ /* -+ * If we can join the mount namespace, we don't need to call -+ * pivot_root, or any other follow up step, since we will already -+ * inherit any fs tree structure the process already has. -+ * -+ * As a matter of fact, we won't even be able to see the container -+ * directories to jump to -+ */ -+ if (!joined_mnt_ns && (ret = ct_chroot(root))) -+ return ret; -+ - ret = 0; - - if ((ret = container_add_task(veid))) { -@@ -265,20 +281,6 @@ out: - return ret; - } - --/* -- * We need to do chroot only after the context is set. Otherwise, we can't find the proc files -- * we need to operate on the ns files -- */ --static int ct_enter(vps_handler *h, envid_t veid, const char *root, int flags) --{ -- int ret; -- if ((ret = __ct_enter(h, veid, flags))) -- return ret; -- if ((ret = ct_chroot(root))) -- return ret; -- return 0; --} -- - #define add_value(val, var, mult) do { if (val) { var = *val * mult; } } while (0) - - static int ct_setlimits(vps_handler *h, envid_t veid, struct ub_struct *ub) diff --git a/0001-vzctl-allow-upstream-to-safely-stop-container-when-s.patch b/0001-vzctl-allow-upstream-to-safely-stop-container-when-s.patch deleted file mode 100644 index ffff9c0..0000000 --- a/0001-vzctl-allow-upstream-to-safely-stop-container-when-s.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 664cb6e123582e7e532adc72ee1a947da7b0d38b Mon Sep 17 00:00:00 2001 -From: Glauber Costa -Date: Tue, 26 Feb 2013 07:40:36 +0400 -Subject: [PATCH] vzctl: allow upstream to safely stop container when setns is - available - -The test preventing the execution of in-container reboot right now just -checks whether or not we are running an upstream Linux Kernel. However, -it is perfectly possible to gracefuly stop the container if joining the -pid namespace is possible. - -Update the test to reflect that. - -Signed-off-by: Glauber Costa ---- - src/lib/env.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: vzctl-4.1.1/src/lib/env.c -=================================================================== ---- vzctl-4.1.1.orig/src/lib/env.c -+++ vzctl-4.1.1/src/lib/env.c -@@ -790,7 +790,7 @@ static int env_stop(vps_handler *h, envi - if (stop_mode == M_KILL) - goto kill_vps; - -- if (!is_vz_kernel(h)) { -+ if (!is_vz_kernel(h) && !h->can_join_pidns) { - logger(-1, 0, "Due to lack of proper support in this kernel, " - "container can't be cleanly\n" - "stopped from the host system. Please stop it from inside, " 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 - 4.3.1-1 +- Updated to upstream version 4.3.1 + * Wed Apr 24 2013 Glauber Costa - 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 - 4.0-1 +* Mon Oct 15 2012 Glauber Costa - 4.0-1 - Packaged for Fedora, trying to reuse as much information as possible from upstream package. From a26ec8e81cfe8431d92fbdbd3cd1b94391c69f5b Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Wed, 5 Jun 2013 23:25:45 +0400 Subject: [PATCH 08/39] Set default values of LOCAL_*ID to zero until userns is enabled CONFIG_USER_NS is not set in the kernel config. --- ...es-of-LOCAL_-ID-to-zero-until-userns.patch | 29 +++++++++++++++++++ vzctl.spec | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch diff --git a/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch b/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch new file mode 100644 index 0000000..ca6006b --- /dev/null +++ b/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch @@ -0,0 +1,29 @@ +From 7af15c352fc0603fe0e854c289152474f8e4553a Mon Sep 17 00:00:00 2001 +From: Andrey Vagin +Date: Wed, 5 Jun 2013 23:17:21 +0400 +Subject: [PATCH] Set default values of LOCAL_*ID to zero until userns is enabled + + +Signed-off-by: Andrey Vagin +--- + etc/vz.conf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/etc/vz.conf.in b/etc/vz.conf.in +index de240ac..cdb3bd2 100644 +--- a/etc/vz.conf.in ++++ b/etc/vz.conf.in +@@ -40,8 +40,8 @@ DEF_OSTEMPLATE="centos-5" + #VE_LAYOUT=ploop + + # User namespace configuration +-LOCAL_UID=100000 +-LOCAL_GID=100000 ++LOCAL_UID=0 ++LOCAL_GID=0 + + ## Load vzwdog module + VZWDOG="no" +-- +1.8.2 + diff --git a/vzctl.spec b/vzctl.spec index 840f080..a216055 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -30,6 +30,7 @@ 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 URL: http://openvz.org/ # OpenVZ can run on its own kernel, and if that it is the case, some more @@ -61,6 +62,7 @@ i.e. create, start, shutdown, set various options and limits etc. %prep %setup -q +%patch0 -p1 %build CFLAGS="$RPM_OPT_FLAGS" %configure \ From 4e79da3b0958d3217c6ba41d43e548428c03d17b Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Thu, 6 Jun 2013 00:48:32 +0400 Subject: [PATCH 09/39] Include missing dependency for gnugpg Signed-off-by: Andrey Vagin --- vzctl.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index a216055..f476ff3 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.3.1 -%define rel 1 +%define rel 2 Release: %{rel}%{?dist} License: GPLv2+ Group: System Environment/Kernel @@ -49,6 +49,7 @@ Requires: grep # requires for bash_completion and vps-download Requires: wget Requires: bridge-utils +Requires: gnupg BuildRequires: libcgroup-devel >= 0.38 @@ -205,6 +206,9 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/ %changelog +* Thu Jun 6 2013 Andrey Vagin - 4.3.1-2 +- Include missing dependency for gnugpg. + * Tue Jun 4 2013 Andrew Vagin - 4.3.1-1 - Updated to upstream version 4.3.1 From e2f6359e16d5edb0ce5c79222328bf5624ceb415 Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Fri, 7 Jun 2013 02:00:31 +0400 Subject: [PATCH 10/39] Fix compilation on architectures without support for VZ (rhbz 971821) Signed-off-by: Andrey Vagin --- ...on-architectures-without-support-for.patch | 29 +++++++++++++++++++ vzctl.spec | 7 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-compilation-on-architectures-without-support-for.patch 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 +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 +--- + 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..a5ea651 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 +Patch0: 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 - 4.3.1-3 +- Fix compilation on architectures without support for VZ (rhbz 971821) + * Thu Jun 6 2013 Andrey Vagin - 4.3.1-2 - Include missing dependency for gnugpg. From c1940ac70bec9a8a064727a28072b9245e1b3e3b Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Fri, 7 Jun 2013 04:36:05 +0400 Subject: [PATCH 11/39] Typo fix in spec file --- vzctl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index a5ea651..bbfcee8 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -31,7 +31,7 @@ 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 -Patch0: 0001-Fix-compilation-on-architectures-without-support-for.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 From e509abb21fbf352f7cec323ce028839e8140dbd2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 19 Jul 2013 21:09:07 +0400 Subject: [PATCH 12/39] spec: fix whitespaces, hardcoded paths, macros styles in defines From d89fe73bba3f10df6c786bfba8240cb0a3386c36 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 19 Jul 2013 20:58:40 +0400 Subject: [PATCH 1/5] spec: fix whitespaces, hardcoded paths, macros styles in defines Acked-by: Kir Kolyshkin Signed-off-by: Igor Gnatenko Signed-off-by: Andrew Vagin --- vzctl.spec | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/vzctl.spec b/vzctl.spec index bbfcee8..c091056 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -1,26 +1,25 @@ -%define _initddir %_sysconfdir/init.d -%define _vzdir /var/lib/vz -%define _lockdir %{_vzdir}/lock -%define _dumpdir %{_vzdir}/dump -%define _privdir %{_vzdir}/private -%define _rootdir %{_vzdir}/root -%define _templatedir %{_vzdir}/template/ -%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 -%define _vpsconfdir %_sysconfdir/sysconfig/vz-scripts -%define _netdir %_sysconfdir/sysconfig/network-scripts -%define _logrdir %_sysconfdir/logrotate.d -%define _distconfdir %{_configdir}/dists -%define _namesdir %{_configdir}/names -%define _distscriptdir %{_distconfdir}/scripts -%define _udevrulesdir %_sysconfdir/udev/rules.d -%define _bashcdir %_sysconfdir/bash_completion.d - +%define _initddir %{_sysconfdir}/init.d +%define _vzdir %{_sharedstatedir}/vz +%define _lockdir %{_vzdir}/lock +%define _dumpdir %{_vzdir}/dump +%define _privdir %{_vzdir}/private +%define _rootdir %{_vzdir}/root +%define _templatedir %{_vzdir}/template +%define _cachedir %{_templatedir}/cache +%define _vzctlvardir %{_sharedstatedir}/vzctl +%define _veipdir %{_vzctlvardir}/veip +%define _vepiddir %{_vzctlvardir}/vepid +%define _pkglibdir %{_libexecdir}/vzctl +%define _scriptdir %{_pkglibdir}/scripts +%define _configdir %{_sysconfdir}/vz +%define _vpsconfdir %{_sysconfdir}/sysconfig/vz-scripts +%define _netdir %{_sysconfdir}/sysconfig/network-scripts +%define _logrdir %{_sysconfdir}/logrotate.d +%define _distconfdir %{_configdir}/dists +%define _namesdir %{_configdir}/names +%define _distscriptdir %{_distconfdir}/scripts +%define _udevrulesdir %{_sysconfdir}/udev/rules.d +%define _bashcdir %{_sysconfdir}/bash_completion.d Summary: OpenVZ containers control utility Name: vzctl From 9f5b7677435e55cff06d40ce326671c6dc6c5631 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 19 Jul 2013 21:09:47 +0400 Subject: [PATCH 13/39] spec: fix requirements crtools, bash From 89d4597b9b0514307a407bba4f87ea0c9f1ed3dd Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 19 Jul 2013 20:59:50 +0400 Subject: [PATCH 2/5] spec: fix requirements crtools, bash Fix requirements: (1) crtools needed because not work basic functionality [0] (2) RPM automatically picks up /bin/sh for package. In CentOS 5+ only bash package provides it. [0] https://fedoraproject.org/wiki/QA:Testcase_vzctl_base Acked-by: Kir Kolyshkin Signed-off-by: Igor Gnatenko Signed-off-by: Andrew Vagin --- vzctl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index c091056..079399b 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -41,8 +41,8 @@ Summary: OpenVZ containers control utility core Group: System Environment/Kernel Requires: fileutils Requires: tar +Requires: crtools # these reqs are for vz helper scripts -Requires: bash Requires: gawk Requires: sed Requires: grep From b482dcab1384df42bb474329ee38157c14b2bab7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 19 Jul 2013 21:10:30 +0400 Subject: [PATCH 14/39] spec: fix whitespaces, macros instead of bash vars, link From 6981c415197278fdf51c844a97277a72d3e54699 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 19 Jul 2013 21:02:06 +0400 Subject: [PATCH 4/5] spec: fix whitespaces, macros instead of bash vars, link In future $RPM_BUILD_ROOT and other bash vars will droped. Also all macros has at the beginning '/' and we should (for better) anymore use '/%{macros}'. Delete hardcoded paths, delete ls ins %install section (not needed). Fix link to directory. Link isn't directory. Link is file. Signed-off-by: Igor Gnatenko Signed-off-by: Andrey Vagin --- vzctl.spec | 91 ++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 47 deletions(-) diff --git a/vzctl.spec b/vzctl.spec index 079399b..babc951 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -67,7 +67,7 @@ i.e. create, start, shutdown, set various options and limits etc. %patch1 -p1 %build -CFLAGS="$RPM_OPT_FLAGS" %configure \ +CFLAGS="%{optflags}" %configure \ vzdir=%{_vzdir} \ --enable-bashcomp \ --enable-logrotate \ @@ -76,59 +76,58 @@ CFLAGS="$RPM_OPT_FLAGS" %configure \ make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT vpsconfdir=%{_vpsconfdir} \ +make DESTDIR=%{buildroot} vpsconfdir=%{_vpsconfdir} \ install install-redhat-from-spec -ln -s ../sysconfig/vz-scripts $RPM_BUILD_ROOT/%{_configdir}/conf -ln -s ../vz/vz.conf $RPM_BUILD_ROOT/etc/sysconfig/vz +ln -s ../sysconfig/vz-scripts %{buildroot}%{_configdir}/conf +ln -s ../vz/vz.conf %{buildroot}%{_sysconfdir}/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.* +rm -f %{buildroot}%{_libdir}/libvzctl.la +rm -f %{buildroot}%{_libdir}/libvzctl.so +rm -f %{buildroot}%{_libdir}/libvzchown.la +rm -f %{buildroot}%{_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. -rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzsplit -rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzlist -rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzmemcheck -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 -rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzeventd -rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzmigrate -rm -f $RPM_BUILD_ROOT/%{_sbindir}/vzubc +rm -f %{buildroot}%{_sbindir}/vzsplit +rm -f %{buildroot}%{_sbindir}/vzlist +rm -f %{buildroot}%{_sbindir}/vzmemcheck +rm -f %{buildroot}%{_sbindir}/vzcpucheck +rm -f %{buildroot}%{_sbindir}/vznetcfg +rm -f %{buildroot}%{_sbindir}/vznetaddbr +rm -f %{buildroot}%{_sbindir}/vzcalc +rm -f %{buildroot}%{_sbindir}/vzcptcheck +rm -f %{buildroot}%{_sbindir}/vzpid +rm -f %{buildroot}%{_sbindir}/vzcfgvalidate +rm -f %{buildroot}%{_sbindir}/vzifup-post +rm -f %{buildroot}%{_sbindir}/vzeventd +rm -f %{buildroot}%{_sbindir}/vzmigrate +rm -f %{buildroot}%{_sbindir}/vzubc -rm -f $RPM_BUILD_ROOT/%{_netdir}/ifup-venet -rm -f $RPM_BUILD_ROOT/%{_netdir}/ifdown-venet -rm -f $RPM_BUILD_ROOT/%{_netdir}/ifcfg-venet0 +rm -f %{buildroot}%{_netdir}/ifup-venet +rm -f %{buildroot}%{_netdir}/ifdown-venet +rm -f %{buildroot}%{_netdir}/ifcfg-venet0 -rm -f $RPM_BUILD_ROOT/%{_initddir}/vz -rm -f $RPM_BUILD_ROOT/%{_initddir}/vzeventd +rm -f %{buildroot}%{_initddir}/vz +rm -f %{buildroot}%{_initddir}/vzeventd -rm -f $RPM_BUILD_ROOT/%{_udevrulesdir}/* +rm -f %{buildroot}%{_udevrulesdir}/* -rm -f $RPM_BUILD_ROOT/%{_scriptdir}/vzevent-reboot -rm -f $RPM_BUILD_ROOT/%{_scriptdir}/vzevent-stop -rm -f $RPM_BUILD_ROOT/%{_scriptdir}/initd-functions +rm -f %{buildroot}%{_scriptdir}/vzevent-reboot +rm -f %{buildroot}%{_scriptdir}/vzevent-stop +rm -f %{buildroot}%{_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 -rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzlist.8 -rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzmemcheck.8 -rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzmigrate.8 -rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzpid.8 -rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/vzsplit.8 -ls $RPM_BUILD_ROOT/%{_mandir}/man8/ +rm -f %{buildroot}%{_mandir}/man8/vzeventd.8 +rm -f %{buildroot}%{_mandir}/man8/vzubc.8 +rm -f %{buildroot}%{_mandir}/man8/vzcalc.8 +rm -f %{buildroot}%{_mandir}/man8/vzcptcheck.8 +rm -f %{buildroot}%{_mandir}/man8/vzcfgvalidate.8 +rm -f %{buildroot}%{_mandir}/man8/vzcpucheck.8 +rm -f %{buildroot}%{_mandir}/man8/vzifup-post.8 +rm -f %{buildroot}%{_mandir}/man8/vzlist.8 +rm -f %{buildroot}%{_mandir}/man8/vzmemcheck.8 +rm -f %{buildroot}%{_mandir}/man8/vzmigrate.8 +rm -f %{buildroot}%{_mandir}/man8/vzpid.8 +rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %post -p /sbin/ldconfig @@ -153,8 +152,6 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/ %dir %{_distconfdir} %dir %{_distscriptdir} %dir %{_vzdir} -%dir %{_sysconfdir}/vz/conf - %{_bashcdir}/* @@ -185,6 +182,7 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/ %{_scriptdir}/vps-rst %{_scriptdir}/vps-rst-env +%{_configdir}/conf %config %{_sysconfdir}/sysconfig/vz %config(noreplace) %{_configdir}/vz.conf %config(noreplace) %{_configdir}/osrelease.conf @@ -205,7 +203,6 @@ ls $RPM_BUILD_ROOT/%{_mandir}/man8/ %config %{_vpsconfdir}/ve-vswap-2g.conf-sample %config %{_vpsconfdir}/ve-vswap-4g.conf-sample - %changelog * Fri Jun 7 2013 Andrey Vagin - 4.3.1-3 - Fix compilation on architectures without support for VZ (rhbz 971821) From 830c2d5b5e096d98294c85b8413d84783c11307c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 19 Jul 2013 21:04:39 +0400 Subject: [PATCH 15/39] spec: update to 4.4, update changelog, fix patches Update source to 4.4. Update changelog ( we don't use long changelog when we have web page ). Drop one of patches ( it's already in sources ). Update patch for new version. Bad idea to disable SELinux and edit sysctl. For selinux we should create policy and we do it. Now also we have "known issues" with note for SELinux. But I've updated wiki page with notes of new script ( %{_scriptdir}/vz-postinstall ). Signed-off-by: Igor Gnatenko --- ...on-architectures-without-support-for.patch | 29 ------------------- ...es-of-LOCAL_-ID-to-zero-until-userns.patch | 15 ++++++---- vzctl.spec | 20 +++++++++---- 3 files changed, 23 insertions(+), 41 deletions(-) delete mode 100644 0001-Fix-compilation-on-architectures-without-support-for.patch diff --git a/0001-Fix-compilation-on-architectures-without-support-for.patch b/0001-Fix-compilation-on-architectures-without-support-for.patch deleted file mode 100644 index 271e8d2..0000000 --- a/0001-Fix-compilation-on-architectures-without-support-for.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b2a4926e26ca7f0dd644485e137068a4310a2cd5 Mon Sep 17 00:00:00 2001 -From: Andrey Vagin -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 ---- - 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/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch b/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch index ca6006b..f71200c 100644 --- a/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch +++ b/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch @@ -1,19 +1,22 @@ -From 7af15c352fc0603fe0e854c289152474f8e4553a Mon Sep 17 00:00:00 2001 +From 40971d96e42bd03183f822496ad1aa646d8570c4 Mon Sep 17 00:00:00 2001 From: Andrey Vagin -Date: Wed, 5 Jun 2013 23:17:21 +0400 -Subject: [PATCH] Set default values of LOCAL_*ID to zero until userns is enabled +Date: Sat, 20 Jul 2013 08:34:26 +0400 +Subject: [PATCH] Set default values of LOCAL_*ID to zero until userns is + enabled +* Sat Jul 20 2013 Igor Gnatenko updated patch for 4.4 +Signed-off-by: Igor Gnatenko Signed-off-by: Andrey Vagin --- etc/vz.conf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/vz.conf.in b/etc/vz.conf.in -index de240ac..cdb3bd2 100644 +index bf20c9a..684e08a 100644 --- a/etc/vz.conf.in +++ b/etc/vz.conf.in -@@ -40,8 +40,8 @@ DEF_OSTEMPLATE="centos-5" +@@ -43,8 +43,8 @@ NAMESERVER=inherit # Copy from host system's /etc/resolv.conf #VE_LAYOUT=ploop # User namespace configuration @@ -25,5 +28,5 @@ index de240ac..cdb3bd2 100644 ## Load vzwdog module VZWDOG="no" -- -1.8.2 +1.8.3.1 diff --git a/vzctl.spec b/vzctl.spec index babc951..7dc86c8 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -23,14 +23,13 @@ Summary: OpenVZ containers control utility Name: vzctl -Version: 4.3.1 -%define rel 3 +Version: 4.4 +%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-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 @@ -46,7 +45,7 @@ Requires: crtools Requires: gawk Requires: sed Requires: grep -# requires for bash_completion and vps-download +# requires for bash_completion and vztmpl-dl Requires: wget Requires: bridge-utils Requires: gnupg @@ -64,7 +63,6 @@ i.e. create, start, shutdown, set various options and limits etc. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build CFLAGS="%{optflags}" %configure \ @@ -158,6 +156,7 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %{_libdir}/libvzctl-*.so %{_libdir}/libvzchown*.so %{_sbindir}/vzctl +%{_sbindir}/vztmpl-dl %{_sbindir}/arpsend %{_sbindir}/ndsend @@ -165,6 +164,7 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %{_distscriptdir}/functions %{_mandir}/man8/vzctl.8.* +%{_mandir}/man8/vztmpl-dl.8.* %{_mandir}/man8/arpsend.8.* %{_mandir}/man8/ndsend.8.* %{_mandir}/man5/ctid.conf.5.* @@ -176,11 +176,12 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %{_scriptdir}/vps-netns_dev_add %{_scriptdir}/vps-netns_dev_del %{_scriptdir}/vps-create -%{_scriptdir}/vps-download +%{_scriptdir}/vz-postinstall %{_scriptdir}/vps-pci %{_scriptdir}/vps-cpt %{_scriptdir}/vps-rst %{_scriptdir}/vps-rst-env +%{_scriptdir}/vz-postinstall %{_configdir}/conf %config %{_sysconfdir}/sysconfig/vz @@ -204,6 +205,13 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Fri Jul 19 2013 Igor Gnatenko - 4.4-1 +- Update to 4.4 ( changelog: http://openvz.org/Download/vzctl/4.4/changes ) +- fix spec: macros instead of bash variables +- fix spec: add crtools as requirements +- fix spec: drop bash from requirements (rpm automatically picks up /bin/sh) +- fix spec: other fixes + * Fri Jun 7 2013 Andrey Vagin - 4.3.1-3 - Fix compilation on architectures without support for VZ (rhbz 971821) From 6c5e7a641cafde1dad695a223974ab071c29e7c8 Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Mon, 22 Jul 2013 14:08:24 +0400 Subject: [PATCH 16/39] Update the sources file --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 24f45b3..fe197ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec31b2eec92d91e26fefd5593c8fc72c vzctl-4.3.1.tar.bz2 +ed202ee1d404d358b2e8a53bd579233c vzctl-4.4.tar.bz2 From ed5f326bcde3ddff0c5afed8632fa56aadeb3bc0 Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Mon, 22 Jul 2013 16:22:54 +0400 Subject: [PATCH 17/39] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5827e92..e8a8605 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /vzctl-4.1.tar.bz2 /vzctl-4.1.1.tar.bz2 /vzctl-4.3.1.tar.bz2 +/vzctl-4.4.tar.bz2 From 4dcf7c40ff25002b50855fee032b13264b19e6f7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 23 Jul 2013 15:00:36 +0400 Subject: [PATCH 18/39] crtools requirements only for x86_64 arch Signed-off-by: Igor Gnatenko Signed-off-by: Andrey Vagin --- vzctl.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index 7dc86c8..1138b1a 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -24,7 +24,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.4 -%define rel 1 +%define rel 2 Release: %{rel}%{?dist} License: GPLv2+ Group: System Environment/Kernel @@ -40,7 +40,9 @@ Summary: OpenVZ containers control utility core Group: System Environment/Kernel Requires: fileutils Requires: tar +%ifarch x86_64 Requires: crtools +%endif # these reqs are for vz helper scripts Requires: gawk Requires: sed @@ -205,6 +207,9 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Tue Jul 23 2013 Igor Gnatenko - 4.4-2 +- crtools requirements only for x86_64 arch (wiki page with known issues updated) + * Fri Jul 19 2013 Igor Gnatenko - 4.4-1 - Update to 4.4 ( changelog: http://openvz.org/Download/vzctl/4.4/changes ) - fix spec: macros instead of bash variables From 21028e4f0da08e80b1a58f2deab2ab4a3933d5f4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:32:54 -0500 Subject: [PATCH 19/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index 1138b1a..8b7ec34 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.4 %define rel 2 -Release: %{rel}%{?dist} +Release: %{rel}%{?dist}.1 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -207,6 +207,9 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 4.4-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jul 23 2013 Igor Gnatenko - 4.4-2 - crtools requirements only for x86_64 arch (wiki page with known issues updated) From f1c581b8a17306ed5a42f595c2ee00163f8509ed Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Tue, 10 Sep 2013 23:46:22 +0400 Subject: [PATCH 20/39] Update to 4.5.1 --- .gitignore | 1 + sources | 2 +- vzctl.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e8a8605..e3c4532 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /vzctl-4.1.1.tar.bz2 /vzctl-4.3.1.tar.bz2 /vzctl-4.4.tar.bz2 +/vzctl-4.5.1.tar.bz2 diff --git a/sources b/sources index fe197ec..003629c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed202ee1d404d358b2e8a53bd579233c vzctl-4.4.tar.bz2 +648ced2ab873a0babf0a465d8757add2 vzctl-4.5.1.tar.bz2 diff --git a/vzctl.spec b/vzctl.spec index 8b7ec34..44d385a 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -23,8 +23,8 @@ Summary: OpenVZ containers control utility Name: vzctl -Version: 4.4 -%define rel 2 +Version: 4.5.1 +%define rel 1 Release: %{rel}%{?dist}.1 License: GPLv2+ Group: System Environment/Kernel @@ -207,6 +207,9 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Tue Sep 10 2013 Andrew Vagin - 4.5.1-1 +- Update to 4.5.1 ( changelog: http://openvz.org/Download/vzctl/4.5/changes ) + * Sun Aug 04 2013 Fedora Release Engineering - 4.4-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 5cc916ad185a60531f9f44bc1d97e5a2dd6ed284 Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Thu, 7 Nov 2013 18:07:00 +0400 Subject: [PATCH 21/39] Update to 4.6 --- .gitignore | 1 + sources | 2 +- vzctl.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e3c4532..b592612 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /vzctl-4.3.1.tar.bz2 /vzctl-4.4.tar.bz2 /vzctl-4.5.1.tar.bz2 +/vzctl-4.6.tar.bz2 diff --git a/sources b/sources index 003629c..c37e5e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -648ced2ab873a0babf0a465d8757add2 vzctl-4.5.1.tar.bz2 +eca164b75fd520ad93eb48acded9cb77 vzctl-4.6.tar.bz2 diff --git a/vzctl.spec b/vzctl.spec index 44d385a..43c11b3 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -23,7 +23,7 @@ Summary: OpenVZ containers control utility Name: vzctl -Version: 4.5.1 +Version: 4.6 %define rel 1 Release: %{rel}%{?dist}.1 License: GPLv2+ @@ -102,6 +102,7 @@ rm -f %{buildroot}%{_sbindir}/vzifup-post rm -f %{buildroot}%{_sbindir}/vzeventd rm -f %{buildroot}%{_sbindir}/vzmigrate rm -f %{buildroot}%{_sbindir}/vzubc +rm -f %{buildroot}%{_sbindir}/vzoversell rm -f %{buildroot}%{_netdir}/ifup-venet rm -f %{buildroot}%{_netdir}/ifdown-venet @@ -183,7 +184,6 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %{_scriptdir}/vps-cpt %{_scriptdir}/vps-rst %{_scriptdir}/vps-rst-env -%{_scriptdir}/vz-postinstall %{_configdir}/conf %config %{_sysconfdir}/sysconfig/vz @@ -207,6 +207,9 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Thu Nov 7 2013 Andrew Vagin - 4.6-1 +- Update to 4.6 ( changelog: http://openvz.org/Download/vzctl/4.6/changes ) + * Tue Sep 10 2013 Andrew Vagin - 4.5.1-1 - Update to 4.5.1 ( changelog: http://openvz.org/Download/vzctl/4.5/changes ) From 8049ec16b083daa1b3e802669424e72f48c16cd4 Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Thu, 28 Nov 2013 08:07:22 +0400 Subject: [PATCH 22/39] Update to 4.6.1 --- .gitignore | 1 + sources | 2 +- vzctl.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b592612..e25efc4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /vzctl-4.4.tar.bz2 /vzctl-4.5.1.tar.bz2 /vzctl-4.6.tar.bz2 +/vzctl-4.6.1.tar.bz2 diff --git a/sources b/sources index c37e5e5..7696e7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eca164b75fd520ad93eb48acded9cb77 vzctl-4.6.tar.bz2 +d93894c9ec72a77f33d3851790be2d17 vzctl-4.6.1.tar.bz2 diff --git a/vzctl.spec b/vzctl.spec index 43c11b3..53f625e 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -23,7 +23,7 @@ Summary: OpenVZ containers control utility Name: vzctl -Version: 4.6 +Version: 4.6.1 %define rel 1 Release: %{rel}%{?dist}.1 License: GPLv2+ @@ -207,6 +207,9 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Thu Nov 28 2013 Andrew Vagin - 4.6.1-1 +- Update to 4.6.1 ( changelog: http://openvz.org/Download/vzctl/4.6.1/changes ) + * Thu Nov 7 2013 Andrew Vagin - 4.6-1 - Update to 4.6 ( changelog: http://openvz.org/Download/vzctl/4.6/changes ) From 4ead461b9d64517da2339bed2c0e28773ff29aa7 Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Tue, 13 May 2014 00:52:04 +0400 Subject: [PATCH 23/39] Update to 4.7.2 --- .gitignore | 1 + ...default-values-of-LOCAL_-ID-to-zero-until-userns.patch | 7 +++++-- sources | 2 +- vzctl.spec | 8 ++++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e25efc4..44aa482 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /vzctl-4.5.1.tar.bz2 /vzctl-4.6.tar.bz2 /vzctl-4.6.1.tar.bz2 +/vzctl-4.7.2.tar.bz2 diff --git a/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch b/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch index f71200c..a7ba474 100644 --- a/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch +++ b/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch @@ -16,8 +16,11 @@ diff --git a/etc/vz.conf.in b/etc/vz.conf.in index bf20c9a..684e08a 100644 --- a/etc/vz.conf.in +++ b/etc/vz.conf.in -@@ -43,8 +43,8 @@ NAMESERVER=inherit # Copy from host system's /etc/resolv.conf - #VE_LAYOUT=ploop +@@ -43,10 +43,10 @@ NAMESERVER=inherit # Copy from host system's /etc/resolv.conf + NAMESERVER=inherit # Copy from host system's /etc/resolv.conf + ## Filesystem layout for new CTs: either simfs or ploop +-VE_LAYOUT=ploop ++#VE_LAYOUT=ploop # User namespace configuration -LOCAL_UID=100000 diff --git a/sources b/sources index 7696e7c..8360089 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d93894c9ec72a77f33d3851790be2d17 vzctl-4.6.1.tar.bz2 +18afc37316cec28290e47eb67bb9b6fa vzctl-4.7.2.tar.bz2 diff --git a/vzctl.spec b/vzctl.spec index 53f625e..c629c7d 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -23,7 +23,7 @@ Summary: OpenVZ containers control utility Name: vzctl -Version: 4.6.1 +Version: 4.7.2 %define rel 1 Release: %{rel}%{?dist}.1 License: GPLv2+ @@ -103,6 +103,7 @@ rm -f %{buildroot}%{_sbindir}/vzeventd rm -f %{buildroot}%{_sbindir}/vzmigrate rm -f %{buildroot}%{_sbindir}/vzubc rm -f %{buildroot}%{_sbindir}/vzoversell +rm -f %{buildroot}%{_sbindir}/vzfsync rm -f %{buildroot}%{_netdir}/ifup-venet rm -f %{buildroot}%{_netdir}/ifdown-venet @@ -129,6 +130,7 @@ rm -f %{buildroot}%{_mandir}/man8/vzmemcheck.8 rm -f %{buildroot}%{_mandir}/man8/vzmigrate.8 rm -f %{buildroot}%{_mandir}/man8/vzpid.8 rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 +rm -f %{buildroot}%{_mandir}/man8/vzfsync.8 %post -p /sbin/ldconfig @@ -198,7 +200,6 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %config %{_distconfdir}/distribution.conf-template %config %{_vpsconfdir}/ve-basic.conf-sample %config %{_vpsconfdir}/ve-light.conf-sample -%config %{_vpsconfdir}/ve-unlimited.conf-sample %config %{_vpsconfdir}/ve-vswap-256m.conf-sample %config %{_vpsconfdir}/ve-vswap-512m.conf-sample %config %{_vpsconfdir}/ve-vswap-1024m.conf-sample @@ -207,6 +208,9 @@ rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Tue May 13 2014 Andrew Vagin - 4.7.2-1 +- Update to 4.7.2 ( changelog: http://openvz.org/Download/vzctl/4.7.2/changes ) + * Thu Nov 28 2013 Andrew Vagin - 4.6.1-1 - Update to 4.6.1 ( changelog: http://openvz.org/Download/vzctl/4.6.1/changes ) From 99249e25e4592fbb4231cf3021fa582189ea9b82 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:07:34 -0500 Subject: [PATCH 24/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index c629c7d..0eca1bd 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.7.2 %define rel 1 -Release: %{rel}%{?dist}.1 +Release: %{rel}%{?dist}.2 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -208,6 +208,9 @@ rm -f %{buildroot}%{_mandir}/man8/vzfsync.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 4.7.2-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue May 13 2014 Andrew Vagin - 4.7.2-1 - Update to 4.7.2 ( changelog: http://openvz.org/Download/vzctl/4.7.2/changes ) From b9ed3efe6c3e24cd3009fcfde707b9988aec85d1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 08:14:16 +0000 Subject: [PATCH 25/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index 0eca1bd..4234f98 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -24,7 +24,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.7.2 -%define rel 1 +%define rel 2 Release: %{rel}%{?dist}.2 License: GPLv2+ Group: System Environment/Kernel @@ -208,6 +208,9 @@ rm -f %{buildroot}%{_mandir}/man8/vzfsync.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 4.7.2-2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 4.7.2-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 216d73812fc55a2839a43ea4c674b95706976b18 Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Wed, 8 Oct 2014 23:41:43 +0400 Subject: [PATCH 26/39] Update to 4.8 --- .gitignore | 1 + sources | 2 +- vzctl.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 44aa482..6bd381c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /vzctl-4.6.tar.bz2 /vzctl-4.6.1.tar.bz2 /vzctl-4.7.2.tar.bz2 +/vzctl-4.8.tar.bz2 diff --git a/sources b/sources index 8360089..dcaf94b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18afc37316cec28290e47eb67bb9b6fa vzctl-4.7.2.tar.bz2 +ad3e9f06ddd553885517952e820325bc vzctl-4.8.tar.bz2 diff --git a/vzctl.spec b/vzctl.spec index 4234f98..aeba628 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -23,9 +23,9 @@ Summary: OpenVZ containers control utility Name: vzctl -Version: 4.7.2 -%define rel 2 -Release: %{rel}%{?dist}.2 +Version: 4.8 +%define rel 1 +Release: %{rel}%{?dist}.1 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -104,6 +104,7 @@ rm -f %{buildroot}%{_sbindir}/vzmigrate rm -f %{buildroot}%{_sbindir}/vzubc rm -f %{buildroot}%{_sbindir}/vzoversell rm -f %{buildroot}%{_sbindir}/vzfsync +rm -f %{buildroot}%{_sbindir}/vznnc rm -f %{buildroot}%{_netdir}/ifup-venet rm -f %{buildroot}%{_netdir}/ifdown-venet @@ -131,6 +132,7 @@ rm -f %{buildroot}%{_mandir}/man8/vzmigrate.8 rm -f %{buildroot}%{_mandir}/man8/vzpid.8 rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 rm -f %{buildroot}%{_mandir}/man8/vzfsync.8 +rm -f %{buildroot}%{_mandir}/man8/vznnc.8 %post -p /sbin/ldconfig @@ -208,6 +210,9 @@ rm -f %{buildroot}%{_mandir}/man8/vzfsync.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Wed Oct 8 2014 Andrew Vagin - 4.8-1 +- Update to 4.8 ( changelog: http://openvz.org/Download/vzctl/4.8/changes ) + * Mon Aug 18 2014 Fedora Release Engineering - 4.7.2-2.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From a1f06f3fe8a98f4a27da274446297dcfd3dc171a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:11:42 +0000 Subject: [PATCH 27/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index aeba628..e364005 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.8 %define rel 1 -Release: %{rel}%{?dist}.1 +Release: %{rel}%{?dist}.2 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -210,6 +210,9 @@ rm -f %{buildroot}%{_mandir}/man8/vznnc.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 4.8-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Oct 8 2014 Andrew Vagin - 4.8-1 - Update to 4.8 ( changelog: http://openvz.org/Download/vzctl/4.8/changes ) From f33080fb06e2207fb7313e4445927207c44fd56e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:52:36 +0000 Subject: [PATCH 28/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index e364005..e2a4999 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.8 %define rel 1 -Release: %{rel}%{?dist}.2 +Release: %{rel}%{?dist}.3 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -210,6 +210,9 @@ rm -f %{buildroot}%{_mandir}/man8/vznnc.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 4.8-1.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 4.8-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 2c4ec61c853e375b4eb58af41cde5bd5f637db79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:13:48 +0000 Subject: [PATCH 29/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index e2a4999..897d146 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.8 %define rel 1 -Release: %{rel}%{?dist}.3 +Release: %{rel}%{?dist}.4 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -210,6 +210,9 @@ rm -f %{buildroot}%{_mandir}/man8/vznnc.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 4.8-1.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 4.8-1.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 6815fdfd79352b3627cb0ae4182fa39aba551628 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:27:59 +0000 Subject: [PATCH 30/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index 897d146..f0f2dde 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.8 %define rel 1 -Release: %{rel}%{?dist}.4 +Release: %{rel}%{?dist}.5 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -210,6 +210,9 @@ rm -f %{buildroot}%{_mandir}/man8/vznnc.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 4.8-1.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 4.8-1.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 18dd96185f9339fac380d5e0466db22391a8f4fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:10:29 +0000 Subject: [PATCH 31/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index f0f2dde..979cac0 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.8 %define rel 1 -Release: %{rel}%{?dist}.5 +Release: %{rel}%{?dist}.6 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -210,6 +210,9 @@ rm -f %{buildroot}%{_mandir}/man8/vznnc.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 4.8-1.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 4.8-1.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 0d4453004c8e1431105179dc9c76b779402cfe26 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 7 Nov 2017 16:37:36 +0100 Subject: [PATCH 32/39] Remove old crufty coreutils requires Signed-off-by: Igor Gnatenko --- vzctl.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vzctl.spec b/vzctl.spec index 979cac0..fe295bc 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.8 %define rel 1 -Release: %{rel}%{?dist}.6 +Release: %{rel}%{?dist}.7 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -38,7 +38,6 @@ URL: http://openvz.org/ %package core Summary: OpenVZ containers control utility core Group: System Environment/Kernel -Requires: fileutils Requires: tar %ifarch x86_64 Requires: crtools @@ -210,6 +209,9 @@ rm -f %{buildroot}%{_mandir}/man8/vznnc.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Tue Nov 07 2017 Igor Gnatenko - 4.8-1.7 +- Remove old crufty coreutils requires + * Thu Aug 03 2017 Fedora Release Engineering - 4.8-1.6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a44eb6b79158a06670df736c7e6d489ead317462 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:43:00 +0000 Subject: [PATCH 33/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index fe295bc..3c5b51f 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.8 %define rel 1 -Release: %{rel}%{?dist}.7 +Release: %{rel}%{?dist}.8 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -209,6 +209,9 @@ rm -f %{buildroot}%{_mandir}/man8/vznnc.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 4.8-1.8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Nov 07 2017 Igor Gnatenko - 4.8-1.7 - Remove old crufty coreutils requires From 2808f3a93bbe27aad0aca1d4f313f3257ea16bf4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:53 +0200 Subject: [PATCH 34/39] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- vzctl.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vzctl.spec b/vzctl.spec index 3c5b51f..cb7b350 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -51,6 +51,7 @@ Requires: wget Requires: bridge-utils Requires: gnupg +BuildRequires: gcc BuildRequires: libcgroup-devel >= 0.38 %description core From 0c08da31f11e5a5ed99e88b754fef900080ca4ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:41:46 +0000 Subject: [PATCH 35/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index cb7b350..cf19a6d 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.8 %define rel 1 -Release: %{rel}%{?dist}.8 +Release: %{rel}%{?dist}.9 License: GPLv2+ Group: System Environment/Kernel Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 @@ -210,6 +210,9 @@ rm -f %{buildroot}%{_mandir}/man8/vznnc.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 4.8-1.9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 4.8-1.8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b6558c0fe049b47bfacf4961bea81f00d0438461 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 36/39] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- vzctl.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/vzctl.spec b/vzctl.spec index cf19a6d..a40ecde 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -27,7 +27,6 @@ Version: 4.8 %define rel 1 Release: %{rel}%{?dist}.9 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 URL: http://openvz.org/ @@ -37,7 +36,6 @@ URL: http://openvz.org/ # "vzctl-core". So we are following their name convention %package core Summary: OpenVZ containers control utility core -Group: System Environment/Kernel Requires: tar %ifarch x86_64 Requires: crtools From 2fa737ef29b6fea814bc13ee98d070c7bede5fe1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:30:09 +0000 Subject: [PATCH 37/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index a40ecde..e97b2a7 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.8 %define rel 1 -Release: %{rel}%{?dist}.9 +Release: %{rel}%{?dist}.10 License: GPLv2+ 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 @@ -208,6 +208,9 @@ rm -f %{buildroot}%{_mandir}/man8/vznnc.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 4.8-1.10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 4.8-1.9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From ee44a08ac3b7e4c2f8315398bf27788af98241b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:14:41 +0000 Subject: [PATCH 38/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vzctl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vzctl.spec b/vzctl.spec index e97b2a7..0a515b7 100644 --- a/vzctl.spec +++ b/vzctl.spec @@ -25,7 +25,7 @@ Summary: OpenVZ containers control utility Name: vzctl Version: 4.8 %define rel 1 -Release: %{rel}%{?dist}.10 +Release: %{rel}%{?dist}.11 License: GPLv2+ 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 @@ -208,6 +208,9 @@ rm -f %{buildroot}%{_mandir}/man8/vznnc.8 %config %{_vpsconfdir}/ve-vswap-4g.conf-sample %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 4.8-1.11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 4.8-1.10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 06a12a9c8ceda37302352f9729fd5f191b35401f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Aug 2019 16:48:34 +0000 Subject: [PATCH 39/39] vzctl fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676199 --- .gitignore | 9 - ...es-of-LOCAL_-ID-to-zero-until-userns.patch | 35 -- dead.package | 1 + sources | 1 - vzctl.spec | 311 ------------------ 5 files changed, 1 insertion(+), 356 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 vzctl.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6bd381c..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/vzctl-4.1.tar.bz2 -/vzctl-4.1.1.tar.bz2 -/vzctl-4.3.1.tar.bz2 -/vzctl-4.4.tar.bz2 -/vzctl-4.5.1.tar.bz2 -/vzctl-4.6.tar.bz2 -/vzctl-4.6.1.tar.bz2 -/vzctl-4.7.2.tar.bz2 -/vzctl-4.8.tar.bz2 diff --git a/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch b/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch deleted file mode 100644 index a7ba474..0000000 --- a/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 40971d96e42bd03183f822496ad1aa646d8570c4 Mon Sep 17 00:00:00 2001 -From: Andrey Vagin -Date: Sat, 20 Jul 2013 08:34:26 +0400 -Subject: [PATCH] Set default values of LOCAL_*ID to zero until userns is - enabled - -* Sat Jul 20 2013 Igor Gnatenko updated patch for 4.4 - -Signed-off-by: Igor Gnatenko -Signed-off-by: Andrey Vagin ---- - etc/vz.conf.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/etc/vz.conf.in b/etc/vz.conf.in -index bf20c9a..684e08a 100644 ---- a/etc/vz.conf.in -+++ b/etc/vz.conf.in -@@ -43,10 +43,10 @@ NAMESERVER=inherit # Copy from host system's /etc/resolv.conf - NAMESERVER=inherit # Copy from host system's /etc/resolv.conf - ## Filesystem layout for new CTs: either simfs or ploop --VE_LAYOUT=ploop -+#VE_LAYOUT=ploop - - # User namespace configuration --LOCAL_UID=100000 --LOCAL_GID=100000 -+LOCAL_UID=0 -+LOCAL_GID=0 - - ## Load vzwdog module - VZWDOG="no" --- -1.8.3.1 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..bb15410 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +vzctl fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676199 diff --git a/sources b/sources deleted file mode 100644 index dcaf94b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -ad3e9f06ddd553885517952e820325bc vzctl-4.8.tar.bz2 diff --git a/vzctl.spec b/vzctl.spec deleted file mode 100644 index 0a515b7..0000000 --- a/vzctl.spec +++ /dev/null @@ -1,311 +0,0 @@ -%define _initddir %{_sysconfdir}/init.d -%define _vzdir %{_sharedstatedir}/vz -%define _lockdir %{_vzdir}/lock -%define _dumpdir %{_vzdir}/dump -%define _privdir %{_vzdir}/private -%define _rootdir %{_vzdir}/root -%define _templatedir %{_vzdir}/template -%define _cachedir %{_templatedir}/cache -%define _vzctlvardir %{_sharedstatedir}/vzctl -%define _veipdir %{_vzctlvardir}/veip -%define _vepiddir %{_vzctlvardir}/vepid -%define _pkglibdir %{_libexecdir}/vzctl -%define _scriptdir %{_pkglibdir}/scripts -%define _configdir %{_sysconfdir}/vz -%define _vpsconfdir %{_sysconfdir}/sysconfig/vz-scripts -%define _netdir %{_sysconfdir}/sysconfig/network-scripts -%define _logrdir %{_sysconfdir}/logrotate.d -%define _distconfdir %{_configdir}/dists -%define _namesdir %{_configdir}/names -%define _distscriptdir %{_distconfdir}/scripts -%define _udevrulesdir %{_sysconfdir}/udev/rules.d -%define _bashcdir %{_sysconfdir}/bash_completion.d - -Summary: OpenVZ containers control utility -Name: vzctl -Version: 4.8 -%define rel 1 -Release: %{rel}%{?dist}.11 -License: GPLv2+ -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 -URL: http://openvz.org/ - -# OpenVZ can run on its own kernel, and if that it is the case, some more -# utilities are needed. They call the core package, that we are installing here, -# "vzctl-core". So we are following their name convention -%package core -Summary: OpenVZ containers control utility core -Requires: tar -%ifarch x86_64 -Requires: crtools -%endif -# these reqs are for vz helper scripts -Requires: gawk -Requires: sed -Requires: grep -# requires for bash_completion and vztmpl-dl -Requires: wget -Requires: bridge-utils -Requires: gnupg - -BuildRequires: gcc -BuildRequires: libcgroup-devel >= 0.38 - -%description core -OpenVZ containers control utility core package - - -%description -This utility allows system administrators to control OpenVZ containers: -i.e. create, start, shutdown, set various options and limits etc. - -%prep -%setup -q -%patch0 -p1 - -%build -CFLAGS="%{optflags}" %configure \ - vzdir=%{_vzdir} \ - --enable-bashcomp \ - --enable-logrotate \ - --without-ploop \ - --disable-static -make %{?_smp_mflags} - -%install -make DESTDIR=%{buildroot} vpsconfdir=%{_vpsconfdir} \ - install install-redhat-from-spec -ln -s ../sysconfig/vz-scripts %{buildroot}%{_configdir}/conf -ln -s ../vz/vz.conf %{buildroot}%{_sysconfdir}/sysconfig/vz - -rm -f %{buildroot}%{_libdir}/libvzctl.la -rm -f %{buildroot}%{_libdir}/libvzctl.so -rm -f %{buildroot}%{_libdir}/libvzchown.la -rm -f %{buildroot}%{_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. -rm -f %{buildroot}%{_sbindir}/vzsplit -rm -f %{buildroot}%{_sbindir}/vzlist -rm -f %{buildroot}%{_sbindir}/vzmemcheck -rm -f %{buildroot}%{_sbindir}/vzcpucheck -rm -f %{buildroot}%{_sbindir}/vznetcfg -rm -f %{buildroot}%{_sbindir}/vznetaddbr -rm -f %{buildroot}%{_sbindir}/vzcalc -rm -f %{buildroot}%{_sbindir}/vzcptcheck -rm -f %{buildroot}%{_sbindir}/vzpid -rm -f %{buildroot}%{_sbindir}/vzcfgvalidate -rm -f %{buildroot}%{_sbindir}/vzifup-post -rm -f %{buildroot}%{_sbindir}/vzeventd -rm -f %{buildroot}%{_sbindir}/vzmigrate -rm -f %{buildroot}%{_sbindir}/vzubc -rm -f %{buildroot}%{_sbindir}/vzoversell -rm -f %{buildroot}%{_sbindir}/vzfsync -rm -f %{buildroot}%{_sbindir}/vznnc - -rm -f %{buildroot}%{_netdir}/ifup-venet -rm -f %{buildroot}%{_netdir}/ifdown-venet -rm -f %{buildroot}%{_netdir}/ifcfg-venet0 - -rm -f %{buildroot}%{_initddir}/vz -rm -f %{buildroot}%{_initddir}/vzeventd - -rm -f %{buildroot}%{_udevrulesdir}/* - -rm -f %{buildroot}%{_scriptdir}/vzevent-reboot -rm -f %{buildroot}%{_scriptdir}/vzevent-stop -rm -f %{buildroot}%{_scriptdir}/initd-functions - -rm -f %{buildroot}%{_mandir}/man8/vzeventd.8 -rm -f %{buildroot}%{_mandir}/man8/vzubc.8 -rm -f %{buildroot}%{_mandir}/man8/vzcalc.8 -rm -f %{buildroot}%{_mandir}/man8/vzcptcheck.8 -rm -f %{buildroot}%{_mandir}/man8/vzcfgvalidate.8 -rm -f %{buildroot}%{_mandir}/man8/vzcpucheck.8 -rm -f %{buildroot}%{_mandir}/man8/vzifup-post.8 -rm -f %{buildroot}%{_mandir}/man8/vzlist.8 -rm -f %{buildroot}%{_mandir}/man8/vzmemcheck.8 -rm -f %{buildroot}%{_mandir}/man8/vzmigrate.8 -rm -f %{buildroot}%{_mandir}/man8/vzpid.8 -rm -f %{buildroot}%{_mandir}/man8/vzsplit.8 -rm -f %{buildroot}%{_mandir}/man8/vzfsync.8 -rm -f %{buildroot}%{_mandir}/man8/vznnc.8 - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files core -%doc COPYING -%dir %{_scriptdir} -%dir %{_pkglibdir} -%dir %{_lockdir} -%dir %{_dumpdir} -%dir %attr(700,root,root) %{_privdir} -%dir %attr(700,root,root) %{_rootdir} -%dir %{_templatedir} -%dir %{_cachedir} -%dir %{_vzctlvardir} -%dir %{_veipdir} -%dir %{_vepiddir} -%dir %{_configdir} -%dir %{_namesdir} -%dir %{_vpsconfdir} -%dir %{_distconfdir} -%dir %{_distscriptdir} -%dir %{_vzdir} - -%{_bashcdir}/* - -%{_libdir}/libvzctl-*.so -%{_libdir}/libvzchown*.so -%{_sbindir}/vzctl -%{_sbindir}/vztmpl-dl -%{_sbindir}/arpsend -%{_sbindir}/ndsend - -%{_distscriptdir}/*.sh -%{_distscriptdir}/functions - -%{_mandir}/man8/vzctl.8.* -%{_mandir}/man8/vztmpl-dl.8.* -%{_mandir}/man8/arpsend.8.* -%{_mandir}/man8/ndsend.8.* -%{_mandir}/man5/ctid.conf.5.* -%{_mandir}/man5/vz.conf.5.* - -%{_scriptdir}/vps-functions -%{_scriptdir}/vps-net_add -%{_scriptdir}/vps-net_del -%{_scriptdir}/vps-netns_dev_add -%{_scriptdir}/vps-netns_dev_del -%{_scriptdir}/vps-create -%{_scriptdir}/vz-postinstall -%{_scriptdir}/vps-pci -%{_scriptdir}/vps-cpt -%{_scriptdir}/vps-rst -%{_scriptdir}/vps-rst-env - -%{_configdir}/conf -%config %{_sysconfdir}/sysconfig/vz -%config(noreplace) %{_configdir}/vz.conf -%config(noreplace) %{_configdir}/osrelease.conf -%config(noreplace) %{_configdir}/download.conf -%config(noreplace) %{_configdir}/oom-groups.conf -%config(noreplace) %{_distconfdir}/*.conf -%config(noreplace) %{_vpsconfdir}/0.conf -%config(noreplace) %{_logrdir}/vzctl -%config %{_distconfdir}/default -%config %{_distconfdir}/distribution.conf-template -%config %{_vpsconfdir}/ve-basic.conf-sample -%config %{_vpsconfdir}/ve-light.conf-sample -%config %{_vpsconfdir}/ve-vswap-256m.conf-sample -%config %{_vpsconfdir}/ve-vswap-512m.conf-sample -%config %{_vpsconfdir}/ve-vswap-1024m.conf-sample -%config %{_vpsconfdir}/ve-vswap-1g.conf-sample -%config %{_vpsconfdir}/ve-vswap-2g.conf-sample -%config %{_vpsconfdir}/ve-vswap-4g.conf-sample - -%changelog -* Sat Jul 27 2019 Fedora Release Engineering - 4.8-1.11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 4.8-1.10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 4.8-1.9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 4.8-1.8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Nov 07 2017 Igor Gnatenko - 4.8-1.7 -- Remove old crufty coreutils requires - -* Thu Aug 03 2017 Fedora Release Engineering - 4.8-1.6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 4.8-1.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 4.8-1.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 4.8-1.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 4.8-1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Oct 8 2014 Andrew Vagin - 4.8-1 -- Update to 4.8 ( changelog: http://openvz.org/Download/vzctl/4.8/changes ) - -* Mon Aug 18 2014 Fedora Release Engineering - 4.7.2-2.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 4.7.2-1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 13 2014 Andrew Vagin - 4.7.2-1 -- Update to 4.7.2 ( changelog: http://openvz.org/Download/vzctl/4.7.2/changes ) - -* Thu Nov 28 2013 Andrew Vagin - 4.6.1-1 -- Update to 4.6.1 ( changelog: http://openvz.org/Download/vzctl/4.6.1/changes ) - -* Thu Nov 7 2013 Andrew Vagin - 4.6-1 -- Update to 4.6 ( changelog: http://openvz.org/Download/vzctl/4.6/changes ) - -* Tue Sep 10 2013 Andrew Vagin - 4.5.1-1 -- Update to 4.5.1 ( changelog: http://openvz.org/Download/vzctl/4.5/changes ) - -* Sun Aug 04 2013 Fedora Release Engineering - 4.4-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 23 2013 Igor Gnatenko - 4.4-2 -- crtools requirements only for x86_64 arch (wiki page with known issues updated) - -* Fri Jul 19 2013 Igor Gnatenko - 4.4-1 -- Update to 4.4 ( changelog: http://openvz.org/Download/vzctl/4.4/changes ) -- fix spec: macros instead of bash variables -- fix spec: add crtools as requirements -- fix spec: drop bash from requirements (rpm automatically picks up /bin/sh) -- fix spec: other fixes - -* Fri Jun 7 2013 Andrey Vagin - 4.3.1-3 -- Fix compilation on architectures without support for VZ (rhbz 971821) - -* Thu Jun 6 2013 Andrey Vagin - 4.3.1-2 -- Include missing dependency for gnugpg. - -* Tue Jun 4 2013 Andrew Vagin - 4.3.1-1 -- Updated to upstream version 4.3.1 - -* Wed Apr 24 2013 Glauber Costa - 4.1.1-4 -- Include missing dependency for bridge-utils. -- Fix problems with user and pid namespaces. - -* Fri Feb 15 2013 Fedora Release Engineering - 4.1.1-3.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Dec 11 2012 Glauber Costa - 4.1.1-3 -- Build on all architectures, fixes #878416. OpenVZ 4.1.1 handles - that, so we don't need to carry a patch. - -* Thu Nov 15 2012 Glauber Costa - 4.1-2 -- Corrected license: GPLv2 -> GPLv2+, which is what the sources actually claim -- Fixed ownership problems with directories _vzdir/template/ and /var/lib/vzctl/ - -* Fri Nov 2 2012 Glauber Costa - 4.1-1 -- Updated to vzctl 4.1 -- Changed hardcoded /vz path to /var/lib/vz - -* Wed Oct 17 2012 Glauber Costa - 4.0-2 -- removed unnecessary _attr entries from _files -- removed _exclude entries from _files, moved it to install -- removed BUILD_ROOT cleaning in _install -- removed libxml2 dependency - -* Mon Oct 15 2012 Glauber Costa - 4.0-1 -- Packaged for Fedora, trying to reuse as much information as possible from - upstream package.