- up to 0.30.213

Changed files:
    util-vserver-pld.patch -> 1.17
    util-vserver.spec -> 1.145

diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch
index 0928333f037f6c2d1bbc7248b5153e7992879729..f7a69dec3d2d6b4c31e4b4c7ba02a1cea1aa07cb 100644 (file)
--- a/util-vserver-pld.patch
+++ b/util-vserver-pld.patch
@@ -1,12 +1,12 @@
 diff -urN util-vserver-0.30.212.org/distrib/Makefile.am util-vserver-0.30.212/distrib/Makefile.am
 --- util-vserver-0.30.212.org/distrib/Makefile.am      2006-12-09 17:15:33.000000000 +0100
 +++ util-vserver-0.30.212/distrib/Makefile.am  2007-02-04 19:00:38.703238500 +0100
-@@ -58,7 +58,9 @@
-                          centos4/pkgs/01 centos4/pkgs/02 centos4/pkgs/03 \
-                          centos4/yum/yum.conf $(wildcard centos4/yum.repos.d/*.repo) \
-                          suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \
--                         suse91/rpm/macros
-+                         suse91/rpm/macros pld-ac/pkgs/01 pld-ac/rpm/macros \
+@@ -65,7 +65,9 @@
+                          suse91/rpm/macros \
+                          gentoo/init-vserver.sh gentoo/net.vserver \
+                          gentoo/reboot.sh gentoo/shutdown.sh \
+-                         etch/vserver-config.sh
++                         etch/vserver-config.sh pld-ac/pkgs/01 pld-ac/rpm/macros \
 +                         pld-ac/rpmlist.d/00.lst \
 +                         pld-th/pkgs/01 pld-th/rpm/macros pld-th/rpmlist.d/00.lst
  
@@ -1041,9 +1041,9 @@ diff -urN util-vserver-0.30.212.org/scripts/Makefile-files util-vserver-0.30.212
                                scripts/save_s_context \
                                scripts/vservers.grabinfo.sh \
 @@ -47,11 +48,13 @@
-                               scripts/vserver-build.yum \
                                scripts/vserver-build.template \
                                scripts/vserver-build.rsync \
+                               scripts/vserver-build.clone \
 +                              scripts/vserver-build.poldek \
                                scripts/vserver-build.functions \
                                scripts/vserver-build.functions.apt \
@@ -1468,8 +1468,8 @@ diff -urN util-vserver-0.30.212.org/scripts/vserver-build util-vserver-0.30.212/
  
  case x"$method" in
      (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
--    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync)
-+    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xpoldek)
+-    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone)
++    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xpoldek)
                . $__PKGLIBDIR/vserver-build.$method
                ;;
      (x)               panic $"No build-method specified";;

diff --git a/util-vserver.spec b/util-vserver.spec
index 29b12d54b0ab49271bb77dd7b0ff4a1fe5d7765d..44aa26440f673cbb9c81bb87348ebfc1ae97e240 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -18,12 +18,12 @@
 Summary:       Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
-Version:       0.30.212
-Release:       8
+Version:       0.30.213
+Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
-# Source0-md5: 386b91732b7f0f132b4e9d978389dcc2
+# Source0-md5: 2a444e725f7789f751ade259a38553ed
 Source1:       vprocunhide.init
 Source2:       vservers.init
 Source3:       vservers-legacy.init
@@ -362,8 +362,8 @@ CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1"
        --with-initrddir=/etc/rc.d/init.d \
        --enable-release \
        --enable-apis=NOLEGACY \
-       %{?with_dietlibc:--enable-dietlibc} \
-       %{!?with_dietlibc:--disable-dietlibc} \
+       --with-initscripts=sysv \
+       --%{?with_dietlibc:en}%{!?with_dietlibc:dis}able-dietlibc \
        MKTEMP=/bin/mktemp \
        MOUNT=/bin/mount \
        PS=/bin/ps \
@@ -543,6 +543,7 @@ fi
 %attr(755,root,root) %{_sbindir}/vnamespace
 %attr(755,root,root) %{_sbindir}/vkill
 %attr(755,root,root) %{_sbindir}/vlimit
+%attr(755,root,root) %{_sbindir}/vdevmap
 %attr(755,root,root) %{_sbindir}/vdu
 %attr(755,root,root) %{_sbindir}/vproc
 %attr(755,root,root) %{_sbindir}/vps
@@ -589,6 +590,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/vhashify.cron
 %attr(755,root,root) %{_libdir}/%{name}/vshelper
 %attr(755,root,root) %{_libdir}/%{name}/vshelper-sync
+%attr(755,root,root) %{_libdir}/%{name}/vsysctl
 %{_mandir}/man8/chbind.8*
 %{_mandir}/man8/chcontext.8*
 %{_mandir}/man8/reducecap.8*
@@ -659,6 +661,7 @@ fi
 %{_libdir}/%{name}/defaults/vunify-exclude
 %attr(755,root,root) %{_libdir}/%{name}/pkgmgmt
 %attr(755,root,root) %{_libdir}/%{name}/vapt-get-worker
+%attr(755,root,root) %{_libdir}/%{name}/vclone
 %attr(755,root,root) %{_libdir}/%{name}/vcopy
 %attr(755,root,root) %{_libdir}/%{name}/vpkg
 %attr(755,root,root) %{_libdir}/%{name}/vpoldek-worker