- up to 0.30.214

Changed files:
    util-vserver-pld.patch -> 1.19
    util-vserver-utmpx.patch -> 1.2
    util-vserver.spec -> 1.153

diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch
index bb1c68ea9b9f3dbe96b28fccd2cddd76a601aec6..9ca60f9496372f1e4bb841e01ba73089b1215588 100644 (file)
--- a/util-vserver-pld.patch
+++ b/util-vserver-pld.patch
@@ -1,20 +1,21 @@
 --- 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
-@@ -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 \
+@@ -73,7 +73,10 @@
+                          breezy/debootstrap.script dapper/debootstrap.script \
+                          edgy/debootstrap.script   feisty/debootstrap.script \
+                          gutsy/debootstrap.script  hoary/debootstrap.script \
+-                         warty/debootstrap.script
++                         warty/debootstrap.script \
++                         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
  
  nobase_confdistrib_DATA       =  rh9/apt/sources.list \
                           fc1/apt/sources.list \
 @@ -67,7 +69,18 @@
-                          fc4/apt/sources.list \
                           fc5/apt/sources.list \
                           fc6/apt/sources.list \
+                          f7/apt/sources.list \
 -                         suse91/apt/sources.list
 +                         suse91/apt/sources.list \
 +                         pld-ac/poldek/aliases.conf \

diff --git a/util-vserver-utmpx.patch b/util-vserver-utmpx.patch
index 3c4525151891bbe16c428f702e0620e983a2f58f..a9ed3d1ff40f7dec583aa0f076eeee04e37b4e71 100644 (file)
--- a/util-vserver-utmpx.patch
+++ b/util-vserver-utmpx.patch
@@ -1,11 +1,29 @@
---- util-vserver-0.30.208/scripts/vserver.functions~   2005-10-11 19:51:05.061289264 +0200
-+++ util-vserver-0.30.208/scripts/vserver.functions    2005-10-20 23:13:31.825830032 +0200
-@@ -266,7 +266,7 @@
+--- util-vserver-0.30.214/scripts/vserver.functions~   2007-09-02 23:06:48.000000000 +0200
++++ util-vserver-0.30.214/scripts/vserver.functions    2007-09-02 23:14:40.713357250 +0200
+@@ -284,7 +284,7 @@
                INITCMD_START=( "$i" "$RUNLEVEL_START" )
                INITCMD_STOP=(  "$i" "$RUNLEVEL_STOP"  )
            done
 -          INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$RUNLEVEL_START" /var/run/utmp )
 +          INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$RUNLEVEL_START" /var/run/utmpx )
+           OPTS_ENV=( "${OPTS_ENV[@]}" PREVLEVEL=N RUNLEVEL="$RUNLEVEL_START" )
+           if test -n "$OPTION_DEBUG_SYSV"; then
+               INITCMD_START=( /bin/bash -x "${INITCMD_START[@]}" )
+@@ -309,7 +309,7 @@
+           _NEED_VSHELPER_SYNC=1
+           test -z "$RUNLEVEL_START"         || INITCMD_START=( "${INITCMD_START[@]}" "$RUNLEVEL_START" )
+           test -z "$RUNLEVEL_STOP"          || INITCMD_STOP=(  "${INITCMD_STOP[@]}"  "$RUNLEVEL_STOP"  )
+-          ! isNumber "${RUNLEVEL_START:-3}" || INITCMD_PREPARE=( $_FAKE_RUNLEVEL "${RUNLEVEL_START:-3}" /var/run/utmp )
++          ! isNumber "${RUNLEVEL_START:-3}" || INITCMD_PREPARE=( $_FAKE_RUNLEVEL "${RUNLEVEL_START:-3}" /var/run/utmpx )
            ;;
-           
-       (xplain)
+ 
+       (xgentoo)
+@@ -317,7 +317,7 @@
+ 
+           INITCMD_START=( env TERM=$TERM /lib/rcscripts/sh/init-vserver.sh "$RUNLEVEL_START" )
+           INITCMD_STOP=( env -i TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown )
+-          INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp )
++          INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmpx )
+           ;;
+ 
+       (x) ;;

diff --git a/util-vserver.spec b/util-vserver.spec
index dc7c1dcf5a34c6f8efd2311f01984f2dc3cd88f3..0a386bc38f4bfd5ff38f112cc4a24c5b42ec9541 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.213
-Release:       7
+Version:       0.30.214
+Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
-# Source0-md5: 2a444e725f7789f751ade259a38553ed
+# Source0-md5: 8bad879e36a6a1b9b4858d0d6d3c8c76
 Source1:       vprocunhide.init
 Source2:       vservers.init
 Source3:       vservers-legacy.init
@@ -576,6 +576,7 @@ fi
 %attr(755,root,root) %{_sbindir}/vserver-info
 %attr(755,root,root) %{_sbindir}/vserver-stat
 %attr(755,root,root) %{_sbindir}/vsomething
+%attr(755,root,root) %{_sbindir}/vtag
 %attr(755,root,root) %{_sbindir}/vtop
 %attr(755,root,root) %{_sbindir}/vuname
 %attr(755,root,root) %{_sbindir}/vwait
@@ -594,6 +595,8 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/fakerunlevel
 %attr(755,root,root) %{_libdir}/%{name}/filetime
 %{_libdir}/%{name}/functions
+%attr(755,root,root) %{_libdir}/%{name}/h2ext
+%attr(755,root,root) %{_libdir}/%{name}/h2ext-worker
 %attr(755,root,root) %{_libdir}/%{name}/keep-ctx-alive
 %attr(755,root,root) %{_libdir}/%{name}/lockfile
 %attr(755,root,root) %{_libdir}/%{name}/mask2prefix
@@ -683,7 +686,6 @@ fi
 %dir %{_libdir}/%{name}/distributions/template
 %attr(755,root,root) %{_libdir}/%{name}/distributions/template/init*
 %attr(-,root,root) %{_libdir}/%{name}/distributions/redhat
-%{_libdir}/%{name}/magic.mime
 %{_libdir}/%{name}/vserver-build.*
 %{_libdir}/%{name}/vserver-setup.functions
 %{_libdir}/%{name}/defaults/fstab