From b49f7bf399536cb340b23ceba10d0d9cdd325b39 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Wed, 31 Mar 2010 17:17:43 +0200
Subject: [PATCH] util-vserver: Updated (0.30.216-pre2864 -> 0.30.216-pre2883)

Note:
The mtab_as_symlink.patch was removed because the fix is included in
0.30.216-pre2883.
---
 security/util-vserver/mtab_as_symlink.patch | 31 ---------------------
 security/util-vserver/util-vserver.desc     |  6 ++--
 2 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 security/util-vserver/mtab_as_symlink.patch

diff --git a/security/util-vserver/mtab_as_symlink.patch b/security/util-vserver/mtab_as_symlink.patch
deleted file mode 100644
index 6cba782a0..000000000
--- a/security/util-vserver/mtab_as_symlink.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../util-vserver/mtab_as_symlink.patch
-# Copyright (C) 2009 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-Index: scripts/vserver.functions
-===================================================================
---- ./scripts/vserver.functions	(revision 2849)
-+++ ./scripts/vserver.functions	(working copy)
-@@ -918,6 +918,10 @@
-     # magic regarding the mtab file; when etc/mtab can not be touched,
-     # add the '-n' flag to mount
-     test -w etc -o -w etc/mtab || xflag=-n
-+    if test -h etc/mtab; then
-+	local l=$($_READLINK etc/mtab)
-+	test "${l#/proc/}" = "$l" || xflag=-n
-+    fi
-     "$@" $_SECURE_MOUNT -a $xflag --chroot --fstab "$fstab" --rootfs no
-     popd >/dev/null
- }
diff --git a/security/util-vserver/util-vserver.desc b/security/util-vserver/util-vserver.desc
index 79113d570..29c4d423a 100644
--- a/security/util-vserver/util-vserver.desc
+++ b/security/util-vserver/util-vserver.desc
@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../util-vserver/util-vserver.desc
-[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@@ -29,14 +29,14 @@
 
 [L] GPL
 [S] Stable
-[V] 0.30.216-pre2864
+[V] 0.30.216-pre2883
 [P] O -?---5---9 190.200
 
 [F] NOPARALLEL DIETLIBC NO-SSP
 
 # vserver utilities
 #[D] 1903976627 util-vserver-0.30.215.tar.bz2 http://ftp.linux-vserver.org/pub/utils/util-vserver/
-[D] 217856080 util-vserver-0.30.216-pre2864.tar.bz2 http://people.linux-vserver.org/~dhozac/t/uv-testing/
+[D] 2989362138 util-vserver-0.30.216-pre2883.tar.bz2 http://people.linux-vserver.org/~dhozac/t/uv-testing/
 
 # and addons
 [D] 3365204218 cq-tools-0.06.tar.bz2 http://www.13thfloor.at/vserver/s_addons/quota/