diff options
Diffstat (limited to 'util-vserver/patches/0.30.210-r12')
22 files changed, 0 insertions, 2170 deletions
diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.208-nicefix.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.208-nicefix.patch deleted file mode 100644 index a528752..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.208-nicefix.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nurp util-vserver-0.30.210.orig/scripts/legacy/vserver util-vserver-0.30.210.nice/scripts/legacy/vserver ---- util-vserver-0.30.210.orig/scripts/legacy/vserver 2005-03-21 21:03:31.000000000 +0100 -+++ util-vserver-0.30.210.nice/scripts/legacy/vserver 2006-04-13 02:34:40.000000000 +0200 -@@ -514,7 +514,7 @@ elif [ "$2" = "start" ] ; then - DOMAINOPT="--domainname $S_DOMAINNAME" - fi - if [ "$S_NICE" != "" ] ; then -- NICECMD="nice -$S_NICE" -+ NICECMD="nice -n $S_NICE" - fi - mkdir -p $__PKGSTATEDIR - chmod 700 $__PKGSTATEDIR -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver.functions util-vserver-0.30.210.nice/scripts/vserver.functions ---- util-vserver-0.30.210.orig/scripts/vserver.functions 2006-01-22 13:24:25.000000000 +0100 -+++ util-vserver-0.30.210.nice/scripts/vserver.functions 2006-04-13 02:35:35.000000000 +0200 -@@ -98,12 +98,11 @@ function _generateChbindOptions - function _generateNiceCommand - { - local vdir=$1 -- local nice -+ local nice=0 - -- test -r "$vdir/nice" || return 0; -- read nice <"$vdir"/nice -+ test -r "$vdir/nice" && read nice <"$vdir"/nice - -- NICE_CMD=( $_NICE -$nice ) -+ NICE_CMD=( $_NICE -n $nice ) - } - - diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.208-sharedportage.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.208-sharedportage.patch deleted file mode 100644 index 051e7f5..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.208-sharedportage.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -NurpP util-vserver-0.30.208/distrib/misc/fstab util-vserver-0.30.208-sharedportage/distrib/misc/fstab ---- util-vserver-0.30.208/distrib/misc/fstab 2005-02-19 19:12:34.000000000 +0100 -+++ util-vserver-0.30.208-sharedportage/distrib/misc/fstab 2005-09-30 14:39:41.790456750 +0200 -@@ -1,3 +1,7 @@ - none /proc proc defaults 0 0 - none /tmp tmpfs size=16m,mode=1777 0 0 - none /dev/pts devpts gid=5,mode=620 0 0 -+ -+# shared portage tree -+#/usr/portage /usr/portage none bind,ro 0 0 -+#/usr/portage/distfiles /usr/portage/distfiles none bind,rw 0 0 diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.209-remove-traditional-syscall.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.209-remove-traditional-syscall.patch deleted file mode 100644 index fdb676a..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.209-remove-traditional-syscall.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: util-vserver-0.30.209/config.h.in -=================================================================== ---- util-vserver-0.30.209.orig/config.h.in -+++ util-vserver-0.30.209/config.h.in -@@ -232,10 +232,4 @@ - /* Use 64bit interface for filesystem operations */ - #undef _FILE_OFFSET_BITS - -- --#if defined(__pic__) && defined(__i386) && !defined(ENSC_SYSCALL_TRADITIONAL) && !defined(ENSC_USE_ALTERNATIVE_SYSCALL_MACROS) --# define ENSC_SYSCALL_TRADITIONAL 1 --#endif -- - #include "compat.h" -- -Index: util-vserver-0.30.209/m4/ensc_syscall.m4 -=================================================================== ---- util-vserver-0.30.209.orig/m4/ensc_syscall.m4 -+++ util-vserver-0.30.209/m4/ensc_syscall.m4 -@@ -101,9 +101,4 @@ int main() { - if test x"$with_syscall" = xtraditional; then - AC_DEFINE(ENSC_SYSCALL_TRADITIONAL, 1, [Define to 1 when the fast syscall(2) invocation does not work]) - fi -- -- AH_BOTTOM([ --#if defined(__pic__) && defined(__i386) && !defined(ENSC_SYSCALL_TRADITIONAL) && !defined(ENSC_USE_ALTERNATIVE_SYSCALL_MACROS) --# define ENSC_SYSCALL_TRADITIONAL 1 --#endif]) - ]) diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-bmask.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-bmask.patch deleted file mode 100644 index 57737fc..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-bmask.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurp util-vserver-0.30.210.orig/lib/syscall_setccaps-v13.hc util-vserver-0.30.210/lib/syscall_setccaps-v13.hc ---- util-vserver-0.30.210.orig/lib/syscall_setccaps-v13.hc 2006-03-12 22:01:36.000000000 +0100 -+++ util-vserver-0.30.210/lib/syscall_setccaps-v13.hc 2006-03-12 22:02:23.000000000 +0100 -@@ -25,7 +25,7 @@ vc_set_ccaps_v13(xid_t xid, struct vc_ct - { - struct vcmd_ctx_caps_v0 k_caps; - -- k_caps.bcaps = caps->bcaps & caps->bmask; -+ k_caps.bcaps = (caps->bcaps & caps->bmask) | ~caps->bmask; - k_caps.ccaps = caps->ccaps; - k_caps.cmask = caps->cmask; - diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-chcontext-secure.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-chcontext-secure.patch deleted file mode 100644 index 2b91fc2..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-chcontext-secure.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- util-vserver-0.30.210.orig/scripts/chcontext 2005-04-08 21:14:47.000000000 +0200 -+++ util-vserver-0.30.210/scripts/chcontext 2006-03-25 05:17:00.000000000 +0100 -@@ -153,9 +153,9 @@ - chain_cmd=( "${chain_cmd[@]}" - -- - $_VATTRIBUTE --set -+ ${OPT_SECURE:+--secure} - ${OPT_CAPS:+--bcap "${OPT_CAPS[*]}"} -- ${OPT_FLAGS:+--flag "${OPT_FLAGS[*]}"} -- ${OPT_SECURE:+--secure} ) -+ ${OPT_FLAGS:+--flag "${OPT_FLAGS[*]}"} ) - - migrate_cmd=( $_VCONTEXT - ${OPT_SILENT:+--silent} diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-chcontext.8.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-chcontext.8.patch deleted file mode 100644 index bf09182..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-chcontext.8.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: util-vserver-0.30.210/man/chcontext.8 -=================================================================== ---- util-vserver-0.30.210.orig/man/chcontext.8 -+++ util-vserver-0.30.210/man/chcontext.8 -@@ -1,4 +1,4 @@ --.TH "chcontext" "1" "0.1.0" "Klavs Klavsen <kl@vsen.dk>" "System Administration" -+.TH "chcontext" "8" "0.1.0" "Klavs Klavsen <kl@vsen.dk>" "System Administration" - .SH "NAME" - .LP - chcontext \- chcontext allocates a new security context and executes a command in that context. diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-clone-arch.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-clone-arch.patch deleted file mode 100644 index fbbdb51..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-clone-arch.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Nurp util-vserver-0.30.210.orig/lib_internal/sys_clone.h util-vserver-0.30.210.clone-arch/lib_internal/sys_clone.h ---- util-vserver-0.30.210.orig/lib_internal/sys_clone.h 2005-04-28 20:01:37.000000000 +0200 -+++ util-vserver-0.30.210.clone-arch/lib_internal/sys_clone.h 2006-04-10 23:43:29.000000000 +0200 -@@ -19,33 +19,54 @@ - #ifndef H_UTIL_VSERVER_SRC_SYS_CLONE_H - #define H_UTIL_VSERVER_SRC_SYS_CLONE_H - -+#include <unistd.h> - #include "lib/syscall-wrap.h" --#define __NR_sys_clone __NR_clone -+#define __NR__sys_clone __NR_clone - - #ifndef CLONE_NEWNS - # define CLONE_NEWNS 0x00020000 - #endif - --#ifdef ENSC_SYSCALL_TRADITIONAL --#include <unistd.h> -+#ifndef ENSC_SYSCALL_TRADITIONAL -+# include <errno.h> - -+# if defined(__s390__) - inline static UNUSED ALWAYSINLINE --int sys_clone(int flags, void *stack) -+_syscall2(int, _sys_clone, void *, child_stack, int, flags) -+# else -+inline static UNUSED ALWAYSINLINE -+_syscall2(int, _sys_clone, int, flags, void *, child_stack) -+# endif -+#endif -+ -+inline static UNUSED ALWAYSINLINE -+int sys_clone(int flags, void *child_stack) - { --#if defined __dietlibc__ -+ int ret; -+#ifdef __sparc__ -+ int parent = getpid(); -+#endif -+#if defined(__dietlibc__) && defined(ENSC_SYSCALL_TRADITIONAL) - extern long int syscall (long int __sysno, ...); - #endif -- -- return syscall(__NR_sys_clone, flags, stack); --} --#else --#include <errno.h> - --inline static UNUSED ALWAYSINLINE --_syscall2(int, sys_clone, int, flags, void *, child_stack) -+#if defined(__s390__) && defined(ENSC_SYSCALL_TRADITIONAL) -+ ret = syscall(__NR__sys_clone, child_stack, flags); -+#elif defined(__s390__) -+ ret = _sys_clone(child_stack, flags); -+#elif defined(ENSC_SYSCALL_TRADITIONAL) -+ ret = syscall(__NR__sys_clone, flags, child_stack); -+#else -+ ret = _sys_clone(flags, child_stack); -+#endif -+#ifdef __sparc__ -+ if (ret == parent) -+ ret = 0; - #endif -+ return ret; -+} - --#undef __NR_sys_clone -+#undef __NR__sys_clone - - #define ENSC_HAVE_SYSCLONE 1 - diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-clone.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-clone.patch deleted file mode 100644 index 9bb46be..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-clone.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -Nurp util-vserver-0.30.210.orig/contrib/manifest.dat.pathsubst util-vserver-0.30.210.clone/contrib/manifest.dat.pathsubst ---- util-vserver-0.30.210.orig/contrib/manifest.dat.pathsubst 2006-01-21 22:34:46.000000000 +0100 -+++ util-vserver-0.30.210.clone/contrib/manifest.dat.pathsubst 2006-03-16 01:48:57.000000000 +0100 -@@ -7,6 +7,7 @@ build @PKGLIBDIR@/vserver-build.skeleto - build @PKGLIBDIR@/vserver-build.debootstrap - build @PKGLIBDIR@/vserver-build.yum - build @PKGLIBDIR@/vserver-build.rpm -+build @PKGLIBDIR@/vserver-build.clone - build @PKGLIBDIR@/vserver-build.functions - build @PKGLIBDIR@/vserver-build.functions.apt - build @PKGLIBDIR@/vserver-build.functions.rpm -diff -Nurp util-vserver-0.30.210.orig/scripts/Makefile-files util-vserver-0.30.210.clone/scripts/Makefile-files ---- util-vserver-0.30.210.orig/scripts/Makefile-files 2005-04-28 19:45:34.000000000 +0200 -+++ util-vserver-0.30.210.clone/scripts/Makefile-files 2006-03-16 02:08:32.000000000 +0100 -@@ -43,6 +43,7 @@ scripts_pkglib_src_DTA = scripts/functio - scripts/vserver-build.debootstrap \ - scripts/vserver-build.rpm \ - scripts/vserver-build.yum \ -+ scripts/vserver-build.clone \ - scripts/vserver-build.functions \ - scripts/vserver-build.functions.apt \ - scripts/vserver-build.functions.rpm \ -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver-build util-vserver-0.30.210.clone/scripts/vserver-build ---- util-vserver-0.30.210.orig/scripts/vserver-build 2005-07-03 19:45:43.000000000 +0200 -+++ util-vserver-0.30.210.clone/scripts/vserver-build 2006-03-16 01:48:36.000000000 +0100 -@@ -126,7 +126,7 @@ setup_setDefaults "$VSERVER_NAME" - - case x"$method" in - (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;; -- (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm) -+ (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xclone) - . $__PKGLIBDIR/vserver-build.$method - ;; - (x) panic $"No build-method specified";; -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver-build.clone util-vserver-0.30.210.clone/scripts/vserver-build.clone ---- util-vserver-0.30.210.orig/scripts/vserver-build.clone 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210.clone/scripts/vserver-build.clone 2006-03-16 02:08:07.000000000 +0100 -@@ -0,0 +1,60 @@ -+# $Id$ --*- sh -*-- -+ -+# Copyright (C) 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; version 2 of the License. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+tmp=$(getopt -o '+d:' --long debug,pkgmgmt,source: -n "$0" -- "$@") || exit 1 -+eval set -- "$tmp" -+ -+. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT" -+ -+DISTRIBUTION=: -+use_pkgmgmt= -+source= -+ -+while true; do -+ case "$1" in -+ -d) DISTRIBUTION=$2; shift;; -+ --debug) set -x;; -+ --pkgmgmt) use_pkgmgmt=1;; -+ --source) source=$2; shift;; -+ --) shift; break ;; -+ *) echo "vserver-build.clone: internal error: unrecognized option '$1'" >&2 -+ exit 1 -+ ;; -+ esac -+ shift -+done -+ -+test -z "$source" && panic $"vserver-build.clone: --source <vserver> is required!" -+ -+getDistribution '' 1 -+ -+base.init -+test -z "$use_pkgmgmt" || pkgmgmt.initVariables -+ -+base.initFilesystem "$OPTION_FORCE" -+test -z "$use_pkgmgmt" || pkgmgmt.initFilesystem "$OPTION_FORCE" -+ -+setup_writeOption "$VSERVER_NAME" -+setup_writeInitialFstab -+ -+$_CP -a "$__CONFDIR/$source/vdir/." "$VDIR" -+ -+test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" -+test -z "$1" || "$@" -+test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" -+ -+base.setSuccess diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-condrestart.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-condrestart.patch deleted file mode 100644 index cdd8cde..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-condrestart.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver util-vserver-0.30.210.condrestart/scripts/vserver ---- util-vserver-0.30.210.orig/scripts/vserver 2005-10-28 20:29:00.000000000 +0200 -+++ util-vserver-0.30.210.condrestart/scripts/vserver 2006-04-13 02:10:28.000000000 +0200 -@@ -208,7 +208,7 @@ case "$2" in - $cmd "$@" - ;; - (condrestart) -- test ! isVserverRunning "$VSERVER_DIR" || restart -+ ! isVserverRunning "$VSERVER_DIR" || restart - ;; - (exec) - shift 2 diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-cpuset.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-cpuset.patch deleted file mode 100644 index 9f21a83..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-cpuset.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver.functions util-vserver-0.30.210.cpuset/scripts/vserver.functions ---- util-vserver-0.30.210.orig/scripts/vserver.functions 2006-01-22 13:24:25.000000000 +0100 -+++ util-vserver-0.30.210.cpuset/scripts/vserver.functions 2006-04-13 01:36:34.000000000 +0200 -@@ -690,6 +690,54 @@ function generateOptions - fi - } - -+function addtoCPUSET -+{ -+ local vdir=$1 -+ local cpuset -+ local f="$vdir"/cpuset -+ local i -+ local configured=0 -+ -+ test -d "$f" || return 0 -+ test -e "$f"/name || return 0 -+ -+ read cpuset < "$f"/name -+ test -e "$f"/nocreate || { -+ test -d /dev/cpuset/"$cpuset" || mkdir /dev/cpuset/"$cpuset" || configured=1 -+ for i in cpus mems cpu_exclusive mem_exclusive virtualize; do -+ if test -e "$f"/"$i"; then -+ cat "$f"/"$i" >/dev/cpuset/"$cpuset"/"$i" 2>/dev/null || { -+ configured=1 -+ break -+ } -+ fi -+ done -+ } -+ -+ echo $$ >/dev/cpuset/"$cpuset"/tasks || configured=1 -+ if [ "$configured" -ne 0 ]; then -+ warning $"\ -+WARNING: Failed to create or CPUSET \"$cpuset\" does not exist! Not using it!" >&2 -+ rmdir /dev/cpuset/"$cpuset" 2>/dev/null || : -+ return 0 -+ fi -+} -+ -+function removeCPUSET -+{ -+ local vdir=$1 -+ local cpuset -+ local f="$vdir"/cpuset -+ -+ test -d "$f" || return 0 -+ test -e "$f"/name || return 0 -+ -+ read cpuset < "$f"/name -+ test -e "$f"/nocreate || { -+ rmdir /dev/cpuset/"$cpuset" 2>/dev/null || : -+ } -+} -+ - function _mountVserverInternal - { - local fstab="$1" -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver-setup.functions util-vserver-0.30.210.cpuset/scripts/vserver-setup.functions ---- util-vserver-0.30.210.orig/scripts/vserver-setup.functions 2006-01-03 00:50:21.000000000 +0100 -+++ util-vserver-0.30.210.cpuset/scripts/vserver-setup.functions 2006-04-13 01:39:08.000000000 +0200 -@@ -24,11 +24,15 @@ SETUP_LOCKFILE= - SETUP_CONFDIR= - SETUP_CONTEXT= - SETUP_INITSTYLE= -+SETUP_CPUSET= -+SETUP_CPUSETCPUS= -+SETUP_CPUSETMEMS= -+SETUP_CPUSETVIRT= - - declare -a SETUP_INTERFACES=() - declare -a SETUP_FLAGS=() - --declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:" -+declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:,cpuset:,cpusetcpus:,cpusetmems:,cpusetvirt" - declare -r SETUP_HELPMSG=$" - --context ... the static context of the vserver [default: none; a dynamic - context will be assumed] -@@ -55,6 +59,19 @@ declare -r SETUP_HELPMSG=$" - this becomes a per vserver limit) - private: No other process can join this security context. - Even root -+ --cpuset <name> -+ ... declares the CPUSET this vserver will run in [default: none] -+ --cpusetcpus <number[-number][:<exclusive>]> -+ ... sets which cpus belong to the CPUSET, -+ exclusive is a flag (0|1) prohibiting any other cpuset from -+ using those cpus -+ --cpusetmems <number[-number][:<exclusive>]> -+ ... sets which memory pools belong to the CPUSET, -+ exclusive is a flag (0|1) prohibiting any other cpuset from -+ using those memory pools -+ --cpusetvirt -+ ... virtualize cpuset (guest will see only CPUs defined in cpuset) -+ Requires kernel patch from http://www.bullopensource.org/cpuset/ - --initstyle <style> - ... configures the initstyle (e.g. minit,sysv,plain) - " -@@ -71,7 +88,23 @@ function setup_setOption2 - (--netprefix) SETUP_NETPREFIX=$2;; - (--netbcast) SETUP_NETBCAST=$2;; - (--interface) SETUP_INTERFACES=( "${SETUP_INTERFACES[@]}" "$2" );; -- (--initstyle) SETUP_INITSTYLE=$2;; -+ (--initstyle) SETUP_INITSTYLE=$2;; -+ (--cpuset) SETUP_CPUSET=$2;; -+ (--cpusetcpus) old_IFS=$IFS -+ IFS=: -+ set -- $2 -+ SETUP_CPUSETCPUS=$1 -+ SETUP_CPUSETCPUSEXCL=$2 -+ IFS=$old_IFS -+ ;; -+ (--cpusetmems) old_IFS=$IFS -+ IFS=: -+ set -- $2 -+ SETUP_CPUSETMEMS=$1 -+ SETUP_CPUSETMEMSEXCL=$2 -+ IFS=$old_IFS -+ ;; -+ (--cpusetvirt) SETUP_CPUSETVIRT=1;; - (--flags) old_IFS=$IFS - IFS=, - set -- $2 -@@ -140,7 +173,7 @@ function setup_writeOption - local cfgdir=${SETUP_CONFDIR:?} - local i - -- mkdir -p "$cfgdir"/interfaces "$cfgdir"/apps/init "$cfgdir"/uts -+ mkdir -p "$cfgdir"/interfaces "$cfgdir"/apps/init "$cfgdir"/uts "$cfgdir"/cpuset - - _setup_writeSingleOption "$name" "$cfgdir"/name - _setup_writeSingleOption "$SETUP_CONTEXT" "$cfgdir"/context -@@ -150,6 +183,12 @@ function setup_writeOption - _setup_writeSingleOption "$SETUP_NETPREFIX" "$cfgdir"/interfaces/prefix - _setup_writeSingleOption "$SETUP_NETBCAST" "$cfgdir"/interfaces/bcast - _setup_writeSingleOption "$SETUP_INITSTYLE" "$cfgdir"/apps/init/style -+ _setup_writeSingleOption "$SETUP_CPUSET" "$cfgdir"/cpuset/name -+ _setup_writeSingleOption "$SETUP_CPUSETCPUS" "$cfgdir"/cpuset/cpus -+ _setup_writeSingleOption "$SETUP_CPUSETCPUSEXCL" "$cfgdir"/cpuset/cpus_exclusive -+ _setup_writeSingleOption "$SETUP_CPUSETMEMS" "$cfgdir"/cpuset/mems -+ _setup_writeSingleOption "$SETUP_CPUSETMEMSEXCL" "$cfgdir"/cpuset/mem_exclusive -+ _setup_writeSingleOption "$SETUP_CPUSETVIRT" "$cfgdir"/cpuset/virtualize - - local idx=0 - for i in "${SETUP_INTERFACES[@]}"; do -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver.start util-vserver-0.30.210.cpuset/scripts/vserver.start ---- util-vserver-0.30.210.orig/scripts/vserver.start 2006-01-22 13:24:25.000000000 +0100 -+++ util-vserver-0.30.210.cpuset/scripts/vserver.start 2006-04-13 01:36:34.000000000 +0200 -@@ -113,6 +113,7 @@ enableInterfaces "$VSERVER_DIR" && have_ - - mountVserver "$VSERVER_DIR" && is_mounted=1 - prepareInit "$VSERVER_DIR" -+addtoCPUSET "$VSERVER_DIR" - - pushd "$VSERVER_DIR"/vdir/ >/dev/null - execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-start -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver.stop util-vserver-0.30.210.cpuset/scripts/vserver.stop ---- util-vserver-0.30.210.orig/scripts/vserver.stop 2006-01-21 14:22:23.000000000 +0100 -+++ util-vserver-0.30.210.cpuset/scripts/vserver.stop 2006-04-13 01:36:34.000000000 +0200 -@@ -101,3 +101,4 @@ disableInterfaces "$VSERVER_DIR" - saveDiskLimits "$VSERVER_DIR" - - execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" postpost-stop -+removeCPUSET "$VSERVER_DIR" -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver.suexec util-vserver-0.30.210.cpuset/scripts/vserver.suexec ---- util-vserver-0.30.210.orig/scripts/vserver.suexec 2005-07-15 21:01:06.000000000 +0200 -+++ util-vserver-0.30.210.cpuset/scripts/vserver.suexec 2006-04-13 01:36:34.000000000 +0200 -@@ -22,6 +22,7 @@ test -z "$is_stopped" -o "$OPTION_INSECU - exit 1 - } - generateOptions "$VSERVER_DIR" -+addtoCPUSET "$VSERVER_DIR" - - user=$1 - shift diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-debootstrap-script.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-debootstrap-script.patch deleted file mode 100644 index f435c7e..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-debootstrap-script.patch +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05_vserver-build_dbootstrap_script.dpatch by Micah Anderson <Micah Anderson <micah@debian.org>> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad trunk~/scripts/vserver-build trunk/scripts/vserver-build ---- trunk~/scripts/vserver-build 2006-03-20 10:28:10.000000000 -0500 -+++ trunk/scripts/vserver-build 2006-03-20 10:31:30.000000000 -0500 -@@ -64,7 +64,7 @@ - skeleton ... -- [<cmd> <args>*] - ... installs a minimal skeleton filesystem, creates the - configuration file and calls an optional command then -- debootstrap ... -- -d <distribution> [-m <mirror>] [-- <debootstrap-options>*] -+ debootstrap ... -- -d <distribution> [-m <mirror>] [-s <script> ] [-- <debootstrap-options>*] - bootstraps the vserver with Debian's 'debootstrap' package - - Please report bugs to $PACKAGE_BUGREPORT" -diff -urNad trunk~/scripts/vserver-build.debootstrap trunk/scripts/vserver-build.debootstrap ---- trunk~/scripts/vserver-build.debootstrap 2006-03-20 10:31:13.000000000 -0500 -+++ trunk/scripts/vserver-build.debootstrap 2006-03-20 10:33:08.000000000 -0500 -@@ -121,7 +121,8 @@ - ### main starts here <--- - - --tmp=$(getopt -o '+d:m:' --long debug -n "$0" -- "$@") || exit 1 -+#Parameter s added for debootstrap use -+tmp=$(getopt -o '+d:m:s:' --long debug -n "$0" -- "$@") || exit 1 - eval set -- "$tmp" - - init -@@ -130,6 +131,8 @@ - case "$1" in - (-d) DISTRIBUTION=$2; shift;; - (-m) mirror=$2; shift;; -+#Parameter s added for debootstrap scripts -+ (-s) script=$2; shift;; - (--debug) set -x;; - (--) shift; break ;; - (*) echo "vserver-build.debootstrap: internal error: unrecognized option '$1'" >&2 -@@ -151,7 +154,8 @@ - - test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" - mv "$VDIR"/dev "$VDIR"/dev.X --"$DEBOOTSTRAP" "$@" "$DISTRIBUTION" "$VDIR" "$mirror" || : ## HACK: ignore all errors... -+#this adds the variable $script to the debootstrap call -+"$DEBOOTSTRAP" "$@" "$DISTRIBUTION" "$VDIR" "$mirror" "$script" || : ## HACK: ignore all errors... - fixupDebian "$VDIR" - test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" - diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-delete.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-delete.patch deleted file mode 100644 index c7b04d9..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-delete.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -Nurp util-vserver-0.30.210.orig/contrib/manifest.dat.pathsubst util-vserver-0.30.210.delete/contrib/manifest.dat.pathsubst ---- util-vserver-0.30.210.orig/contrib/manifest.dat.pathsubst 2006-01-21 22:34:46.000000000 +0100 -+++ util-vserver-0.30.210.delete/contrib/manifest.dat.pathsubst 2006-03-25 00:33:26.000000000 +0100 -@@ -18,6 +18,7 @@ base @PKGLIBDIR@/vserver.start - @ENSC_HAVE_C99_COMPILER_TRUE@base @PKGLIBDIR@/vserver.start.bin - base @PKGLIBDIR@/vserver.stop - base @PKGLIBDIR@/vserver.suexec -+base @PKGLIBDIR@/vserver.delete - core @PKGLIBDIR@/util-vserver-vars - build @PKGLIBDIR@/rpm-fake.so - legacy @LEGACYDIR@/save_s_context -diff -Nurp util-vserver-0.30.210.orig/Makefile.in util-vserver-0.30.210.delete/Makefile.in ---- util-vserver-0.30.210.orig/Makefile.in 2006-01-22 20:33:21.000000000 +0100 -+++ util-vserver-0.30.210.delete/Makefile.in 2006-04-06 19:50:42.000000000 +0200 -@@ -1927,7 +1927,8 @@ scripts_pkglib_src_DTA = scripts/functio - scripts/vserver.functions \ - scripts/vserver.start \ - scripts/vserver.stop \ -- scripts/vserver.suexec -+ scripts/vserver.suexec \ -+ scripts/vserver.delete - - scripts_pkglib_gen_DTA = scripts/util-vserver-vars - scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \ -diff -Nurp util-vserver-0.30.210.orig/scripts/Makefile-files util-vserver-0.30.210.delete/scripts/Makefile-files ---- util-vserver-0.30.210.orig/scripts/Makefile-files 2005-04-28 19:45:34.000000000 +0200 -+++ util-vserver-0.30.210.delete/scripts/Makefile-files 2006-03-25 00:31:07.000000000 +0100 -@@ -52,7 +52,8 @@ scripts_pkglib_src_DTA = scripts/functio - scripts/vserver.functions \ - scripts/vserver.start \ - scripts/vserver.stop \ -- scripts/vserver.suexec -+ scripts/vserver.suexec \ -+ scripts/vserver.delete - - scripts_pkglib_gen_DTA = scripts/util-vserver-vars - -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver util-vserver-0.30.210.delete/scripts/vserver ---- util-vserver-0.30.210.orig/scripts/vserver 2005-10-28 20:29:00.000000000 +0200 -+++ util-vserver-0.30.210.delete/scripts/vserver 2006-03-23 23:07:03.000000000 +0100 -@@ -57,6 +57,7 @@ Possible commands are: - - build <buildopts>* - ... builds a new vserver from scratch -+ delete ... remove a vserver - - unify [-R] - ... (de)unify vserver -@@ -199,7 +200,7 @@ test "$2" != start -o -n "$OPTION_NONAME - - . $__PKGLIBDIR/vserver.functions - case "$2" in -- (start|stop) -+ (start|stop|delete) - shift 2 - . $__PKGLIBDIR/vserver.$cmd - ;; -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver.delete util-vserver-0.30.210.delete/scripts/vserver.delete ---- util-vserver-0.30.210.orig/scripts/vserver.delete 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210.delete/scripts/vserver.delete 2006-03-25 00:49:35.000000000 +0100 -@@ -0,0 +1,34 @@ -+#! /bin/bash -+# $Id$ -+ -+# Copyright (C) 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; version 2 of the License. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+. "$_LIB_VSERVER_BUILD_FUNCTIONS" -+. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT" -+ -+if test -z "$OPTION_SILENT" ; then -+ read -p "Are you sure you want to delete the vserver $vserver (y/N) " deleteok -+ if [[ ${deleteok} != [Yy] ]]; then -+ exit 2 -+ fi -+fi -+ -+isVserverRunning "$VSERVER_DIR" && -+ "${SELF[@]}" $OPTION_SILENT --sync "$vserver" stop -+ -+base.init -+pkgmgmt.initVariables -+rm -rf "`readlink -f "$VSERVER_DIR"/vdir`" "$VSERVER_DIR" "$PKGCFGDIR" diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-fc5.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-fc5.patch deleted file mode 100644 index 895206c..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-fc5.patch +++ /dev/null @@ -1,403 +0,0 @@ -diff -NurpP util-vserver-0.30.210/distrib/centos42/pkgs/03 util-vserver-0.30.210-fc5/distrib/centos42/pkgs/03 ---- util-vserver-0.30.210/distrib/centos42/pkgs/03 2005-01-27 15:14:07.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/centos42/pkgs/03 2006-04-13 14:44:32.579223250 +0200 -@@ -1,2 +1,5 @@ - coreutils - setup -+vps-dev -+vps-fakekernel -+vps-fakepackages -diff -NurpP util-vserver-0.30.210/distrib/centos42/yum.repos.d/cru-vps.repo util-vserver-0.30.210-fc5/distrib/centos42/yum.repos.d/cru-vps.repo ---- util-vserver-0.30.210/distrib/centos42/yum.repos.d/cru-vps.repo 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/centos42/yum.repos.d/cru-vps.repo 2006-04-13 14:44:32.579223250 +0200 -@@ -0,0 +1,5 @@ -+[cru-vps] -+name=Cru APT Repository for CentOS 4 vservers -+baseurl=http://mirror.naturidentisch.de/yum/centos4-vps/ -+gpgcheck=1 -+gpgkey=http://naturidentisch.de/packages/cru.asc -diff -NurpP util-vserver-0.30.210/distrib/fc4/pkgs/03 util-vserver-0.30.210-fc5/distrib/fc4/pkgs/03 ---- util-vserver-0.30.210/distrib/fc4/pkgs/03 2005-01-27 15:14:07.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc4/pkgs/03 2006-04-13 14:44:32.583223500 +0200 -@@ -1,2 +1,5 @@ - coreutils - setup -+vps-dev -+vps-fakekernel -+vps-fakepackages -diff -NurpP util-vserver-0.30.210/distrib/fc4/yum.repos.d/cru-vps.repo util-vserver-0.30.210-fc5/distrib/fc4/yum.repos.d/cru-vps.repo ---- util-vserver-0.30.210/distrib/fc4/yum.repos.d/cru-vps.repo 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc4/yum.repos.d/cru-vps.repo 2006-04-13 14:44:32.583223500 +0200 -@@ -0,0 +1,5 @@ -+[cru-vps] -+name=Cru APT Repository for Fedora 4 vservers -+baseurl=http://mirror.naturidentisch.de/yum/fc4-vps/ -+gpgcheck=1 -+gpgkey=http://naturidentisch.de/packages/cru.asc -diff -NurpP util-vserver-0.30.210/distrib/fc5/apt/rpmpriorities util-vserver-0.30.210-fc5/distrib/fc5/apt/rpmpriorities ---- util-vserver-0.30.210/distrib/fc5/apt/rpmpriorities 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/apt/rpmpriorities 2006-04-13 14:44:29.159009500 +0200 -@@ -0,0 +1,7 @@ -+Essential: -+ basesystem -+ coreutils -+ filesystem -+ glibc -+ setup -+ fedora-release -diff -NurpP util-vserver-0.30.210/distrib/fc5/apt/sources.list util-vserver-0.30.210-fc5/distrib/fc5/apt/sources.list ---- util-vserver-0.30.210/distrib/fc5/apt/sources.list 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/apt/sources.list 2006-04-13 14:44:29.163009750 +0200 -@@ -0,0 +1,7 @@ -+# rpm http://ftp.ultra.csn.tu-chemnitz.de/pub/mirror/fedora/core/.apt 3/i386 os patches updates -+ -+# rpm ftp://ftp.ussg.iu.edu/pub/linux/fedora/fedora/fedora 3/i386 os updates -+# rpm ftp://ftp.tu-chemnitz.de/pub/linux/fedora/fedora 3/i386 os updates -+# rpm http://mirrors.usc.edu/pub/linux/fedora/fedora/fedora 3/i386 os updates -+# rpm http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/fedora/fedora 3/i386 os updates -+# rpm http://download.fedora.us/fedora/fedora 3/i386 os updates -diff -NurpP util-vserver-0.30.210/distrib/fc5/pkgs/01 util-vserver-0.30.210-fc5/distrib/fc5/pkgs/01 ---- util-vserver-0.30.210/distrib/fc5/pkgs/01 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/pkgs/01 2006-04-13 14:44:29.163009750 +0200 -@@ -0,0 +1 @@ -+glibc -diff -NurpP util-vserver-0.30.210/distrib/fc5/pkgs/02 util-vserver-0.30.210-fc5/distrib/fc5/pkgs/02 ---- util-vserver-0.30.210/distrib/fc5/pkgs/02 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/pkgs/02 2006-04-13 14:44:29.163009750 +0200 -@@ -0,0 +1,3 @@ -+--reinstall -+ -+filesystem -diff -NurpP util-vserver-0.30.210/distrib/fc5/pkgs/03 util-vserver-0.30.210-fc5/distrib/fc5/pkgs/03 ---- util-vserver-0.30.210/distrib/fc5/pkgs/03 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/pkgs/03 2006-04-13 14:44:32.583223500 +0200 -@@ -0,0 +1,5 @@ -+coreutils -+initscripts -+vps-dev -+vps-fakekernel -+vps-fakepackages -diff -NurpP util-vserver-0.30.210/distrib/fc5/rpmlist.d/00.lst util-vserver-0.30.210-fc5/distrib/fc5/rpmlist.d/00.lst ---- util-vserver-0.30.210/distrib/fc5/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/rpmlist.d/00.lst 2006-04-13 14:44:29.163009750 +0200 -@@ -0,0 +1,7 @@ -+basesystem-*.rpm -+filesystem-*.rpm -+glibc-common-*.rpm -+glibc-[0-9]*.rpm -+libgcc-[0-9]*.rpm -+setup-*.rpm -+tzdata-*.rpm -diff -NurpP util-vserver-0.30.210/distrib/fc5/yum/yum.conf util-vserver-0.30.210-fc5/distrib/fc5/yum/yum.conf ---- util-vserver-0.30.210/distrib/fc5/yum/yum.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/yum/yum.conf 2006-04-13 14:44:29.175010500 +0200 -@@ -0,0 +1,10 @@ -+[main] -+cachedir=@YUMCACHEDIR@ -+reposdir=@YUMETCDIR@/yum.repos.d -+debuglevel=1 -+logfile=@YUMLOGDIR@/log -+lockfile=@YUMLOCKDIR@/yum.pid -+pkgpolicy=newest -+distroverpkg=fedora-release -+installonlypkgs= -+exactarch=0 -diff -NurpP util-vserver-0.30.210/distrib/fc5/yum.repos.d/cru-fc5-vps.repo util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/cru-fc5-vps.repo ---- util-vserver-0.30.210/distrib/fc5/yum.repos.d/cru-fc5-vps.repo 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/cru-fc5-vps.repo 2006-04-13 14:44:32.583223500 +0200 -@@ -0,0 +1,6 @@ -+[cru-vps] -+name=Cru APT Repository for Fedora Core 5 vservers -+baseurl=http://mirror.naturidentisch.de/yum/fc5-vps/ -+enabled=1 -+gpgcheck=1 -+gpgkey=http://naturidentisch.de/packages/cru.asc -diff -NurpP util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-core.repo util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-core.repo ---- util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-core.repo 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-core.repo 2006-04-13 14:44:29.175010500 +0200 -@@ -0,0 +1,21 @@ -+[core] -+name=Fedora Core 5 - $basearch -+#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/5/$basearch/os/ -+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 -+enabled=1 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY -+ -+[core-debuginfo] -+name=Fedora Core 5 - $basearch - Debug -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/5/$basearch/debug/ -+enabled=0 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY -+ -+[core-source] -+name=Fedora Core 5 - Source -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/5/source/SRPMS/ -+enabled=0 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY -diff -NurpP util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-development.repo util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-development.repo ---- util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-development.repo 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-development.repo 2006-04-13 14:44:29.195011750 +0200 -@@ -0,0 +1,44 @@ -+# These packages are untested and still under development. This -+# repository is used for updates to test releases, and for -+# development of new releases. -+# -+# This repository can see significant daily turnover and major -+# functionality changes which cause unexpected problems with other -+# development packages. Please use these packages if you want to work -+# with the Fedora developers by testing these new development packages. -+# -+# fedora-test-list@redhat.com is available as a discussion forum for -+# testing and troubleshooting for development packages in conjunction -+# with new test releases. -+# -+# fedora-devel-list@redhat.com is available as a discussion forum for -+# testing and troubleshooting for development packages in conjunction -+# with developing new releases. -+# -+# More information is available at http://fedoraproject.org/wiki/Testing -+# -+# Reproducible and reportable issues should be filed at -+# http://bugzilla.redhat.com/. -+# -+# Product: Fedora Core -+# Version: devel -+ -+[development] -+name=Fedora Core - Development -+#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/ -+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide -+enabled=0 -+gpgcheck=0 -+ -+[development-debuginfo] -+name=Fedora Core - Development - Debug -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/debug/ -+enabled=0 -+gpgcheck=0 -+ -+[development-source] -+name=Fedora Core - Development - Source -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/ -+enabled=0 -+gpgcheck=0 -+ -diff -NurpP util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-extras-development.repo util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-extras-development.repo ---- util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-extras-development.repo 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-extras-development.repo 2006-04-13 14:44:29.199012000 +0200 -@@ -0,0 +1,21 @@ -+[extras-development] -+name=Fedora Extras - Development Tree -+#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/ -+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel -+enabled=0 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras -+gpgcheck=1 -+ -+[extras-development-debuginfo] -+name=Fedora Extras - Development - Debug -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/debug/ -+enabled=0 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras -+gpgcheck=1 -+ -+[extras-development-source] -+name=Fedora Extras - Development - Source -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/SRPMS/ -+enabled=0 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras -+gpgcheck=1 -diff -NurpP util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-extras.repo util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-extras.repo ---- util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-extras.repo 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-extras.repo 2006-04-13 14:44:29.199012000 +0200 -@@ -0,0 +1,21 @@ -+[extras] -+name=Fedora Extras 5 - $basearch -+#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/5/$basearch/ -+mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 -+enabled=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras -+gpgcheck=1 -+ -+[extras-debuginfo] -+name=Fedora Extras 5 - $basearch - Debug -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/5/$basearch/debug/ -+enabled=0 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras -+gpgcheck=1 -+ -+[extras-source] -+name=Fedora Extras 5 - Source -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/5/SRPMS/ -+enabled=0 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras -+gpgcheck=1 -diff -NurpP util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-legacy.repo util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-legacy.repo ---- util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-legacy.repo 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-legacy.repo 2006-04-13 14:44:29.199012000 +0200 -@@ -0,0 +1,13 @@ -+[legacy-updates] -+name=Fedora Legacy 5 - $basearch - Updates -+mirrorlist=http://fedora.redhat.com/download/mirrors/legacy-updates-released-fc5 -+enabled=0 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy -+ -+[legacy-testing] -+name=Fedora Legacy 5 - $basearch - Updates Testing -+mirrorlist=http://fedora.redhat.com/download/mirrors/legacy-updates-testing-fc5 -+enabled=0 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy -diff -NurpP util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-updates.repo util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-updates.repo ---- util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-updates.repo 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-updates.repo 2006-04-13 14:44:29.199012000 +0200 -@@ -0,0 +1,21 @@ -+[updates] -+name=Fedora Core 5 - $basearch - Updates -+#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/$basearch/ -+mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 -+enabled=1 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora -+ -+[updates-debuginfo] -+name=Fedora Core 5 - $basearch - Updates - Debug -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/$basearch/debug/ -+enabled=0 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora -+ -+[updates-source] -+name=Fedora Core 5 - Updates Source -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/SRPMS/ -+enabled=0 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora -diff -NurpP util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-updates-testing.repo util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-updates-testing.repo ---- util-vserver-0.30.210/distrib/fc5/yum.repos.d/fedora-updates-testing.repo 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/fc5/yum.repos.d/fedora-updates-testing.repo 2006-04-13 14:44:29.199012000 +0200 -@@ -0,0 +1,21 @@ -+[updates-testing] -+name=Fedora Core 5 - $basearch - Test Updates -+#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/5/$basearch/ -+mirrorlist=http://fedora.redhat.com/download/mirrors/updates-testing-fc5 -+enabled=0 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test -+ -+[updates-testing-debuginfo] -+name=Fedora Core 5 - $basearch - Test Updates Debug -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/5/$basearch/debug/ -+enabled=0 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test -+ -+[updates-testing-source] -+name=Fedora Core 5 - Test Updates Source -+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/5/SRPMS/ -+enabled=0 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test -diff -NurpP util-vserver-0.30.210/distrib/Makefile.am util-vserver-0.30.210-fc5/distrib/Makefile.am ---- util-vserver-0.30.210/distrib/Makefile.am 2005-10-28 19:53:49.000000000 +0200 -+++ util-vserver-0.30.210-fc5/distrib/Makefile.am 2006-04-13 14:44:29.203012250 +0200 -@@ -40,13 +40,16 @@ nobase_distrib_DATA = defaults/devs \ - fc1/apt/rpmpriorities fc1/pkgs/01 fc1/pkgs/02 \ - fc2/apt/rpmpriorities fc2/pkgs/01 fc2/pkgs/02 \ - fc3/apt/rpmpriorities fc3/pkgs/01 fc3/pkgs/02 fc3/pkgs/03 \ -- fc3/yum/yum.conf $(wildcard fc3/yum.repos.d/fedora*.repo) \ -+ fc3/yum/yum.conf $(wildcard fc3/yum.repos.d/*.repo) \ - $(wildcard fc3/rpmlist.d/*.lst) $(wildcard fc3/rpmlist.d/*.opt) \ - fc4/apt/rpmpriorities fc4/pkgs/01 fc4/pkgs/02 fc4/pkgs/03 \ -- fc4/yum/yum.conf $(wildcard fc4/yum.repos.d/fedora*.repo) \ -+ fc4/yum/yum.conf $(wildcard fc4/yum.repos.d/*.repo) \ - $(wildcard fc4/rpmlist.d/*.lst) $(wildcard fc4/rpmlist.d/*.opt) \ -+ fc5/apt/rpmpriorities fc5/pkgs/01 fc5/pkgs/02 fc5/pkgs/03 \ -+ fc5/yum/yum.conf $(wildcard fc5/yum.repos.d/*.repo) \ -+ $(wildcard fc5/rpmlist.d/*.lst) $(wildcard fc5/rpmlist.d/*.opt) \ - centos42/pkgs/01 centos42/pkgs/02 centos42/pkgs/03 \ -- centos42/yum/yum.conf $(wildcard centos42/yum.repos.d/CentOS*.repo) \ -+ centos42/yum/yum.conf $(wildcard centos42/yum.repos.d/*.repo) \ - suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ - suse91/rpm/macros - -@@ -65,7 +68,7 @@ EXTRA_DIST = $(nobase_distrib_DATA) \ - $(nobase_confdistrib_DATA) \ - $(defaults_DATA) - --redhat_style = rh9 fc1 fc2 fc3 fc4 centos42 -+redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 centos42 - - install-exec-hook: install-notify-xtra - install-data-hook: install-data-xtras -diff -NurpP util-vserver-0.30.210/distrib/Makefile.in util-vserver-0.30.210-fc5/distrib/Makefile.in ---- util-vserver-0.30.210/distrib/Makefile.in 2006-01-22 20:33:16.000000000 +0100 -+++ util-vserver-0.30.210-fc5/distrib/Makefile.in 2006-04-13 14:44:29.203012250 +0200 -@@ -275,13 +275,16 @@ nobase_distrib_DATA = defaults/devs \ - fc1/apt/rpmpriorities fc1/pkgs/01 fc1/pkgs/02 \ - fc2/apt/rpmpriorities fc2/pkgs/01 fc2/pkgs/02 \ - fc3/apt/rpmpriorities fc3/pkgs/01 fc3/pkgs/02 fc3/pkgs/03 \ -- fc3/yum/yum.conf $(wildcard fc3/yum.repos.d/fedora*.repo) \ -+ fc3/yum/yum.conf $(wildcard fc3/yum.repos.d/*.repo) \ - $(wildcard fc3/rpmlist.d/*.lst) $(wildcard fc3/rpmlist.d/*.opt) \ - fc4/apt/rpmpriorities fc4/pkgs/01 fc4/pkgs/02 fc4/pkgs/03 \ -- fc4/yum/yum.conf $(wildcard fc4/yum.repos.d/fedora*.repo) \ -+ fc4/yum/yum.conf $(wildcard fc4/yum.repos.d/*.repo) \ - $(wildcard fc4/rpmlist.d/*.lst) $(wildcard fc4/rpmlist.d/*.opt) \ -+ fc5/apt/rpmpriorities fc5/pkgs/01 fc5/pkgs/02 fc5/pkgs/03 \ -+ fc5/yum/yum.conf $(wildcard fc5/yum.repos.d/*.repo) \ -+ $(wildcard fc5/rpmlist.d/*.lst) $(wildcard fc5/rpmlist.d/*.opt) \ - centos42/pkgs/01 centos42/pkgs/02 centos42/pkgs/03 \ -- centos42/yum/yum.conf $(wildcard centos42/yum.repos.d/CentOS*.repo) \ -+ centos42/yum/yum.conf $(wildcard centos42/yum.repos.d/*.repo) \ - suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ - suse91/rpm/macros - -@@ -297,7 +300,7 @@ EXTRA_DIST = $(nobase_distrib_DATA) \ - $(nobase_confdistrib_DATA) \ - $(defaults_DATA) - --redhat_style = rh9 fc1 fc2 fc3 fc4 centos42 -+redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 centos42 - all: all-am - - .SUFFIXES: -@@ -444,7 +447,7 @@ CTAGS: - - - distdir: $(DISTFILES) -- $(mkdir_p) $(distdir)/../m4 $(distdir)/centos42/pkgs $(distdir)/centos42/yum $(distdir)/centos42/yum.repos.d $(distdir)/defaults $(distdir)/defaults/apt $(distdir)/defaults/rpm $(distdir)/fc1/apt $(distdir)/fc1/pkgs $(distdir)/fc2/apt $(distdir)/fc2/pkgs $(distdir)/fc3/apt $(distdir)/fc3/pkgs $(distdir)/fc3/rpmlist.d $(distdir)/fc3/yum $(distdir)/fc3/yum.repos.d $(distdir)/fc4/apt $(distdir)/fc4/pkgs $(distdir)/fc4/rpmlist.d $(distdir)/fc4/yum $(distdir)/fc4/yum.repos.d $(distdir)/misc $(distdir)/redhat $(distdir)/rh9/apt $(distdir)/rh9/pkgs $(distdir)/suse91/apt $(distdir)/suse91/pkgs $(distdir)/suse91/rpm $(distdir)/template -+ $(mkdir_p) $(distdir)/../m4 $(distdir)/centos42/pkgs $(distdir)/centos42/yum $(distdir)/centos42/yum.repos.d $(distdir)/defaults $(distdir)/defaults/apt $(distdir)/defaults/rpm $(distdir)/fc1/apt $(distdir)/fc1/pkgs $(distdir)/fc2/apt $(distdir)/fc2/pkgs $(distdir)/fc3/apt $(distdir)/fc3/pkgs $(distdir)/fc3/rpmlist.d $(distdir)/fc3/yum $(distdir)/fc3/yum.repos.d $(distdir)/fc4/apt $(distdir)/fc4/pkgs $(distdir)/fc4/rpmlist.d $(distdir)/fc4/yum $(distdir)/fc4/yum.repos.d $(distdir)/fc5/apt $(distdir)/fc5/pkgs $(distdir)/fc5/rpmlist.d $(distdir)/fc5/yum $(distdir)/fc5/yum.repos.d $(distdir)/misc $(distdir)/redhat $(distdir)/rh9/apt $(distdir)/rh9/pkgs $(distdir)/suse91/apt $(distdir)/suse91/pkgs $(distdir)/suse91/rpm $(distdir)/template - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ -diff -NurpP util-vserver-0.30.210/distrib/redhat/initpost util-vserver-0.30.210-fc5/distrib/redhat/initpost ---- util-vserver-0.30.210/distrib/redhat/initpost 2005-10-29 17:58:40.000000000 +0200 -+++ util-vserver-0.30.210-fc5/distrib/redhat/initpost 2006-04-13 14:44:29.203012250 +0200 -@@ -52,7 +52,7 @@ $_VSERVER "$vserver" start --rescue bash - f=/tmp/startwait - trap "rm -f $f" EXIT - mkfifo $f -- ( sleep 10; kill -s 9 -- -1 ) & -+ ( sleep 15; kill -s 9 -- -1 ) & - cat "$f" >/dev/null - kill -s 9 -- -1 - wait -diff -NurpP util-vserver-0.30.210/scripts/vyum-worker util-vserver-0.30.210-fc5/scripts/vyum-worker ---- util-vserver-0.30.210/scripts/vyum-worker 2005-10-31 10:55:59.000000000 +0100 -+++ util-vserver-0.30.210-fc5/scripts/vyum-worker 2006-04-13 14:44:29.203012250 +0200 -@@ -39,8 +39,8 @@ test -z "$_YUM" || { - - yum=${YUM:-yum} - conf=yum.conf --case $(yum --version) in -- (2.[01234]*) -+case $($yum --version|tail -n 1) in -+ (2.[0123456]*) - python -c 'import yum,sys; sys.exit(not hasattr(yum.config.yumconf, "getRootedPath"))' &>/dev/null || { - warning "\ - You are using a version of yum which is insecure and broken in chroot diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-gentoo-tools.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-gentoo-tools.patch deleted file mode 100644 index a415d0a..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-gentoo-tools.patch +++ /dev/null @@ -1,74 +0,0 @@ -Index: util-vserver-0.30.210/scripts/Makefile-files -=================================================================== ---- util-vserver-0.30.210.orig/scripts/Makefile-files -+++ util-vserver-0.30.210/scripts/Makefile-files -@@ -38,6 +38,7 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \ - - - scripts_pkglib_src_DTA = scripts/functions \ -+ scripts/gentoo-functions.sh \ - scripts/vserver-build.apt-rpm \ - scripts/vserver-build.skeleton \ - scripts/vserver-build.debootstrap \ -@@ -68,6 +69,7 @@ scripts_pkglib_src_SCRPTS = scripts/pkgm - scripts/vservers.grabinfo.sh \ - scripts/vshelper \ - scripts/vsysvwrapper \ -+ scripts/vschedcalc \ - scripts/vyum-worker - - scripts_legacy_src_SCRPTS = scripts/legacy/save_s_context \ -@@ -85,7 +87,12 @@ scripts_sbin_src_PRGS = scripts/chconte - scripts/vserver \ - scripts/vsomething \ - scripts/vtop \ -- scripts/vyum -+ scripts/vyum \ -+ scripts/vdispatch-conf \ -+ scripts/vemerge \ -+ scripts/vesync \ -+ scripts/vserver-new \ -+ scripts/vupdateworld - - scripts_sbin_gen_PRGS = - scripts_sbincfg_gen_DTA = -Index: util-vserver-0.30.210/scripts/util-vserver-vars.pathsubst -=================================================================== ---- util-vserver-0.30.210.orig/scripts/util-vserver-vars.pathsubst -+++ util-vserver-0.30.210/scripts/util-vserver-vars.pathsubst -@@ -43,6 +43,7 @@ _IFSPEC="$__LEGACYDIR/ifspec" - _INITSYNC_MINIT_START=: - _KEEP_CTX_ALIVE="$__PKGLIBDIR/keep-ctx-alive" - _LIB_FUNCTIONS="$__PKGLIBDIR/functions" -+_LIB_GENTOO_FUNCTIONS="$__PKGLIBDIR/gentoo-functions.sh" - _LIB_VSERVER_SETUP_FUNCTIONS="$__PKGLIBDIR/vserver-setup.functions" - _LIB_VSERVER_BUILD_FUNCTIONS="$__PKGLIBDIR/vserver-build.functions" - _LIB_VSERVER_BUILD_FUNCTIONS_APT="$__PKGLIBDIR/vserver-build.functions.apt" -@@ -68,6 +69,9 @@ _VAPT_GET_WORKER="$__PKGLIBDIR/vapt-get- - _VATTRIBUTE="$__SBINDIR/vattribute" - _VCONTEXT="$__SBINDIR/vcontext" - _VDLIMIT="$__SBINDIR/vdlimit" -+_VDISPATCH_CONF="$__SBINDIR/vdispatch-conf" -+_VEMERGE="$__SBINDIR/vemerge" -+_VESYNC="$__SBINDIR/vesync" - _VDU="$__SBINDIR/vdu" - _VHASHIFY="$__PKGLIBDIR/vhashify" - _VKILL="$__SBINDIR/vkill" -@@ -81,7 +85,9 @@ _VRPM="$__SBINDIR/vrpm" - _VRPM_PRELOAD="$__PKGLIBDIR/vrpm-preload" - _VRPM_WORKER="$__PKGLIBDIR/vrpm-worker" - _VSCHED="$__SBINDIR/vsched" -+_VSCHEDCALC="$__PKGLIBDIR/vschedcalc" - _VSERVER="$__SBINDIR/vserver" -+_VSERVER_NEW="$__SBINDIR/vserver-new" - _VSERVER_LEGACY="$__LEGACYDIR/vserver" - _VSERVER_BUILD="$__PKGLIBDIR/vserver-build" - _VSERVER_INFO="$__SBINDIR/vserver-info" -@@ -92,6 +98,7 @@ _VSOMETHING="$__SBINDIR/vsomething" - _VWAIT="$__SBINDIR/vwait" - _VUNAME="$__SBINDIR/vuname" - _VUNIFY="$__PKGLIBDIR/vunify" -+_VUPDATEWORLD="$__SBINDIR/vupdateworld" - _VYUM="$__SBINDIR/vyum" - _VYUM_WORKER="$__PKGLIBDIR/vyum-worker" - diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-namespace-cleanup.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-namespace-cleanup.patch deleted file mode 100644 index 84440f8..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-namespace-cleanup.patch +++ /dev/null @@ -1,117 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 12_vnamespace_cleanup.dpatch by Micah Anderson <Micah Anderson <micah@debian.org>> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad trunk~/doc/configuration.xml trunk/doc/configuration.xml ---- trunk~/doc/configuration.xml 2006-03-20 08:16:46.000000000 -0500 -+++ trunk/doc/configuration.xml 2006-04-05 23:18:43.000000000 -0400 -@@ -37,6 +37,14 @@ - </description> - </boolean> - -+ <boolean id="global-namespace-cleanup" name="namespace-cleanup"> -+ <description> -+Enable namespace cleanup globally. It can be overridden for a single vserver -+by setting the <optionref ref="global-nonamespace-cleanup">nonamespace-cleanup</optionref> flag -+there. -+ </description> -+ </boolean> -+ - <link name="run.rev"> - <description> - Path of the vserver run reverse directory. This directory contains -@@ -344,6 +352,19 @@ - </description> - </boolean> - -+ <boolean id="global-nonamespace-cleanup" name="nonamespace-cleanup"> -+ <description> -+Overrides the global <optionref ref="global-namespace-cleanup">namespace-cleanup</optionref> flag and disables -+namespace cleanup for the current vserver. -+ </description> -+ </boolean> -+ -+ <boolean name="namespace-cleanup"> -+ <description> -+Enable namespace cleanup for the current vserver. -+ </description> -+ </boolean> -+ - <hash name="schedule"> - <description> - [experimental; name is subject of possible change] Contains the -diff -urNad trunk~/scripts/functions trunk/scripts/functions ---- trunk~/scripts/functions 2006-03-20 08:16:45.000000000 -0500 -+++ trunk/scripts/functions 2006-04-05 23:18:43.000000000 -0400 -@@ -480,6 +480,18 @@ - -e "$cfgdir"/nonamespace - } - -+function isNamespaceCleanup -+{ -+ local cfgdir -+ -+ $_VSERVER_INFO - FEATURE namespace || return 0 -+ cfgdir=$($_VSERVER_INFO "$1" CFGDIR) || return 0 -+ test -e "$cfgdir"/nonamespace-cleanup && return 0 -+ test -e "$__CONFDIR"/.defaults/namespace-cleanup -o \ -+ -e "$cfgdir"/namespace-cleanup && return 1 -+ return 0 -+} -+ - ## Usage: getAllVservers <var> [<KIND>*] - function getAllVservers - { -diff -urNad trunk~/scripts/vserver.functions trunk/scripts/vserver.functions ---- trunk~/scripts/vserver.functions 2006-03-20 08:16:45.000000000 -0500 -+++ trunk/scripts/vserver.functions 2006-04-05 23:19:01.000000000 -0400 -@@ -743,13 +743,13 @@ - - test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" - -- test -z "$NAMESPACE_CLEANUP" || isAvoidNamespace "$cfgdir" || \ -- $_VNAMESPACE --cleanup -- - _mountVserverInternal "$cfgdir"/fstab - _mountVserverInternal "$cfgdir"/fstab.local - _mountVserverInternal "$cfgdir"/fstab.remote $_CHBIND "${CHBIND_OPTS[@]}" - -+ isNamespaceCleanup "$cfgdir" || \ -+ _namespaceCleanup -+ - isAvoidNamespace "$cfgdir" || \ - $_SECURE_MOUNT --rbind -n "$vdir" "/" - } -@@ -1099,3 +1099,29 @@ - _saveSingleDiskLimit "$vdir" "$dlimit" - done - } -+ -+function _namespaceCleanup -+{ -+ local root=$(readlink -f "$vdir") -+ local tmp="$root" -+ local list="" -+ while [ "$tmp" ]; do -+ list="$list $tmp" -+ tmp="${tmp%/*}" -+ done -+ local list_umount="" -+ while read dev path opts; do -+ [ "$path" ] || continue -+ for i in $root /dev /proc; do -+ [ "${path#$i}" != "$path" ] && continue 2 -+ done -+ for i in $list /; do -+ [ "$path" = "$i" ] && continue 2 -+ done -+ list_umount="$path $list_umount" -+ done < /proc/mounts -+ for i in $list_umount; do -+ umount $i -+ done -+} -+ diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-remove-init-style-gentoo.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-remove-init-style-gentoo.patch deleted file mode 100644 index 7fabe46..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-remove-init-style-gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: util-vserver-0.30.210/scripts/vserver.functions -=================================================================== ---- util-vserver-0.30.210.orig/scripts/vserver.functions -+++ util-vserver-0.30.210/scripts/vserver.functions -@@ -292,9 +292,7 @@ function _generateInitOptions - ;; - - (xgentoo) -- INITCMD_START=( /sbin/rc default ) -- INITCMD_STOP=( /sbin/rc shutdown ) -- ;; -+ panic "init-style '$INITSTYLE' is no longer supported; please use plain instead; aborting";; - - (x) ;; - (*) panic "Unknown init-style '$INITSTYLE'; aborting";; diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-syscall-update.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-syscall-update.patch deleted file mode 100644 index 47d07b8..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-syscall-update.patch +++ /dev/null @@ -1,244 +0,0 @@ -diff -NurpP util-vserver-0.30.210/lib/syscall-alternative.h util-vserver-0.30.210-shiny10/lib/syscall-alternative.h ---- util-vserver-0.30.210/lib/syscall-alternative.h 2005-10-28 18:33:50.000000000 +0200 -+++ util-vserver-0.30.210-shiny10/lib/syscall-alternative.h 2006-04-02 21:07:52.000000000 +0200 -@@ -1,9 +1,7 @@ -- // from http://vserver.13thfloor.at/Experimental/SYSCALL/syscall_shiny7.h -- - #ifndef __SYSCALL_NEW_H - #define __SYSCALL_NEW_H - --/* Copyright (C) 2005 Herbert Pötzl -+/* Copyright (C) 2005-2006 Herbert Pötzl - - global config options - -@@ -39,12 +37,13 @@ - __sysc_rcon(n) ... syscall register constraint - __sysc_regs ... list of input regs for clobber - __sysc_type ... register type -+ __sysc_aout ... asm code output constraint - - if all else fails - - __sc_asmload(n,N,...) ... asm code to prepare arguments - __sc_asmsysc(n,N) ... asm code to execute syscall -- __sc_asmsave(n,r,e) ... asm code to store results -+ __sc_asmsave(n) ... asm code to store results - - */ - -@@ -243,7 +242,8 @@ - sret: r0(r28) - serr: (sret >= (unsigned)-EMAXERRNO) - call: ble 0x100(%%sr2, %%r0) -- clob: r1, r2, r4, r20, r29, r31, memory -+ clob: r1, r2, (r4), r20, r29, r31, memory -+ picr: pr(r19) - */ - - #define __sysc_max_err 4095 -@@ -253,13 +253,21 @@ - ("r26", "r25", "r24", "r23", "r22", "r21") - - #define __sysc_cmd_sys "ble 0x100(%%sr2,%%r0)" --#define __sysc_cmd_fin "ldi %0,%%r20" - --#define __sysc_clobber __sysc_regs, \ -- "r1", "r2", "r4", "r20", "r29", "r31", "memory" -+#define __sysc_pre(n) \ -+ __pasm(n,1,1, "copy %%r19, %%r4" , ) - --#warning syscall arch hppa not tested yet -+#define __sysc_fin(n) \ -+ __casm(n,1,1, "ldi %0,%%r20" , )\ -+ __pasm(n,1,1, "copy %%r4, %%r19" , ) - -+#ifndef __PIC__ -+#define __sysc_clobber __sysc_regs, \ -+ "r1", "r2", "r20", "r29", "r31", "memory" -+#else -+#define __sysc_clobber __sysc_regs, \ -+ "r1", "r2", "r4", "r20", "r29", "r31", "memory" -+#endif - - - /* ***************************************** -@@ -277,6 +285,7 @@ - sret: r0(eax) - serr: (sret >= (unsigned)-EMAXERRNO) - call: int 0x80 -+ picr: pr(ebx) - clob: memory - */ - -@@ -301,15 +310,18 @@ - __casm(n,6,1, "pushl %%ebp" , )\ - ""::__sc_iregs(n,__VA_ARGS__):__sysc_clobber) - -+#define __sc_asmsave(n) -+ - #define __sysc_pre(n) \ - __casm(n,6,1, "movl %%eax,%%ebp" , )\ -- __casm(n,0,1, "movl %0,%%eax" , )\ -+ __casm(n,0,1, "movl %1,%%eax" , )\ - - #define __sysc_fin(n) \ - __casm(n,6,1, "popl %%ebp" , )\ - __pasm(n,1,1, "popl %%ebx" , )\ - --#define __sysc_clobber __sysc_regs, "eax", "memory" -+#define __sysc_aout "=a"(__res) -+#define __sysc_clobber __sysc_regs, "memory" - - - /* ***************************************** -@@ -399,8 +411,43 @@ - - #elif defined(__mips__) - --#error syscall arch mips not implemented yet -+/* The ABIO32 calling convention uses a0-a3 to pass the first -+ four arguments, the rest is passed on the userspace stack. The 5th arg -+ starts at 16($sp). -+ -+ ABIN32 and ABI64 pass 6 args in a0-a3, t0-t1. -+ -+ scnr: id(v0) -+ args: a1(a0), a2(a1), a3(a2), a4(a3), a5(16($sp)), a6(20($sp)) -+ sret: r0(v0) -+ serr: e0(a3) -+ call: syscall -+ clob: at, v0, t0-t7, t8-t9 -+*/ -+ -+#define __sysc_reg_cid "v0" -+#define __sysc_reg_ret "v0" -+#define __sysc_reg_err "a3" -+#define __sysc_cmd_sys "syscall" -+ -+#define __sysc_reg(n) __arg_##n\ -+ ("a0","a1","a2","a3", "t0", "t1") - -+#define __sysc_clobber "$1", "$3", "$8", "$9", "$10", "$11", "$12", \ -+ "$13", "$14", "$15", "$24", "$25", "memory" -+ -+#if _MIPS_SIM == _ABIO32 -+#define __sysc_pre(n) \ -+ __casm(n,5,1,"addiu $sp,$sp,-32",) \ -+ __casm(n,6,1,"sw $9,20($sp)",) \ -+ __casm(n,5,1,"sw $8, 16($sp)",) -+#define __sysc_fin(n) \ -+ __casm(n,5,1,"addiu $sp,$sp,32",) -+#elif (_MIPS_SIM == _ABIN32) || (_MIPS_SIM == _ABI64) -+#warning syscall arch mips with ABI N32 and 64 not tested yet -+#else -+#error unknown mips ABI version -+#endif - - - /* ***************************************** -@@ -651,6 +698,7 @@ - #define __sysc_clobber __sysc_regs, \ - "cc", "r11", "rcx", "memory" - -+#define __sysc_aout "=a"(__res) - - #else - #error unknown kernel arch -@@ -834,7 +882,7 @@ - #define __sc_inp_def(n,value) - #endif - --#ifndef __sysc_save -+#if !defined(__sysc_save) && !defined(__sysc_aout) - #define __sc_res_def(n,r) __sc_asm_reg(n, r); - #else - #define __sc_res_def(n,r) __sc_reg(n); -@@ -865,7 +913,6 @@ - #endif - - -- - #ifdef __sc_complex /* complex result */ - - #ifndef __sysc_errc -@@ -918,6 +965,7 @@ - return (type)(res) - #endif - -+ - #define __sc_results \ - __sc_res_def(__res, __sysc_reg_res) - -@@ -939,8 +987,13 @@ - __casm(n,3,0,"%3 ",) __casm(n,4,0,"%4 ",) __casm(n,5,0,"%5 ",) \ - __casm(n,6,0,"%6 ",) "*/" - -+#ifdef __sysc_aout -+#define __sc_dummy_save(n) -+#define __sc_asmsave(n) -+#else - #define __sc_dummy_save(n) "/* gcc dummy save " \ - __casm(n,0,0,"%0 ",) __casm(n,1,0,"%1 ",) "*/" -+#endif - - #define __comment(name) "\t/* kernel sys_" \ - #name "[" __stringify(__sc_id(name)) "] */" -@@ -1006,10 +1059,14 @@ - #endif - #endif - -+#ifndef __sysc_aout -+#define __sysc_aout -+#endif -+ - #ifndef __sc_asmsysc - #define __sc_asmsysc(n,N) __sc_asm_vol( \ - __casm(n,0,0, __sc_cmds(n,N) , )\ -- ::"i"(__sc_id(N)) : __sysc_clobber) -+ :__sysc_aout:"i"(__sc_id(N)) : __sysc_clobber) - #endif - - #ifndef __sc_asmsave -@@ -1031,33 +1088,33 @@ - - - --#define _syscall0(type, name) \ -+#define _syscall0(type, name) \ - type name(void) \ - __sc_body(0, type, name, *) - --#define _syscall1(type, name, type1, arg1) \ -+#define _syscall1(type, name, type1, arg1) \ - type name(type1 arg1) \ - __sc_body(1, type, name, arg1) - --#define _syscall2(type, name, type1, arg1, type2, arg2) \ -+#define _syscall2(type, name, type1, arg1, type2, arg2) \ - type name(type1 arg1, type2 arg2) \ - __sc_body(2, type, name, arg1, arg2) - --#define _syscall3(type, name, type1, arg1, type2, arg2, type3, arg3) \ -+#define _syscall3(type, name, type1, arg1, type2, arg2, type3, arg3) \ - type name(type1 arg1, type2 arg2, type3 arg3) \ - __sc_body(3, type, name, arg1, arg2, arg3) - --#define _syscall4(type, name, type1, arg1, type2, arg2, type3, arg3, \ -+#define _syscall4(type, name, type1, arg1, type2, arg2, type3, arg3, \ - type4, arg4) \ - type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ - __sc_body(4, type, name, arg1, arg2, arg3, arg4) - --#define _syscall5(type, name, type1, arg1, type2, arg2, type3, arg3, \ -- type4, arg4, type5, arg5) \ -+#define _syscall5(type, name, type1, arg1, type2, arg2, type3, arg3, \ -+ type4, arg4, type5, arg5) \ - type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \ - __sc_body(5, type, name, arg1, arg2, arg3, arg4, arg5) - --#define _syscall6(type, name, type1, arg1, type2, arg2, type3, arg3, \ -+#define _syscall6(type, name, type1, arg1, type2, arg2, type3, arg3, \ - type4, arg4, type5, arg5, type6, arg6) \ - type name(type1 arg1, type2 arg2, type3 arg3, \ - type4 arg4, type5 arg5, type6 arg6) \ diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-testsuite-fix.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-testsuite-fix.patch deleted file mode 100644 index b9cfd46..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-testsuite-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -NurpP util-vserver-0.30.210/lib/testsuite/personality.c util-vserver-0.30.210-testfix/lib/testsuite/personality.c ---- util-vserver-0.30.210/lib/testsuite/personality.c 2005-12-31 11:31:55.000000000 +0100 -+++ util-vserver-0.30.210-testfix/lib/testsuite/personality.c 2006-03-16 17:41:30.239559250 +0100 -@@ -73,7 +73,6 @@ int main() - TEST_T2PF("SHORT_INODE", 0, SHORT_INODE); - TEST_T2PF("WHOLE_SECONDS", 0, WHOLE_SECONDS); - TEST_T2PF("STICKY_TIMEOUTS", 0, STICKY_TIMEOUTS); -- TEST_T2PF("ADDR_LIMIT_3GB", 0, ADDR_LIMIT_3GB); - - - // the _loc* tests -@@ -82,7 +81,6 @@ int main() - TEST_PF2T("SHORT_INODE", SHORT_INODE); - TEST_PF2T("WHOLE_SECONDS", WHOLE_SECONDS); - TEST_PF2T("STICKY_TIMEOUTS", STICKY_TIMEOUTS); -- TEST_PF2T("ADDR_LIMIT_3GB", ADDR_LIMIT_3GB); - - - -@@ -123,10 +121,10 @@ int main() - TEST_LIST("mmap_page_zero,any", 0, -1, MMAP_PAGE_ZERO, 15, 3); - - TEST_LIST("mmap_page_zero,addr_limit_32bit,short_inode,whole_seconds," -- "sticky_timeouts,addr_limit_3gb", -+ "sticky_timeouts", - 0, 0, - MMAP_PAGE_ZERO|ADDR_LIMIT_32BIT|SHORT_INODE|WHOLE_SECONDS| -- STICKY_TIMEOUTS|ADDR_LIMIT_3GB, -+ STICKY_TIMEOUTS, - -1, 0); - - TEST_T2PT("linux", 0, PER_LINUX); -diff -NurpP util-vserver-0.30.210/src/testsuite/vunify-test.sh util-vserver-0.30.210-testfix/src/testsuite/vunify-test.sh ---- util-vserver-0.30.210/src/testsuite/vunify-test.sh 2005-03-21 21:03:33.000000000 +0100 -+++ util-vserver-0.30.210-testfix/src/testsuite/vunify-test.sh 2006-03-16 17:37:04.014921250 +0100 -@@ -1,6 +1,7 @@ - #! /bin/bash - --: ${srcdir=.} -+: ${srcdir:=.} -+: ${builddir:=.} - : ${tmptopdir=/var/tmp} - - set -e -@@ -49,5 +50,5 @@ pushd $tmpdir &>/dev/null - popd &>/dev/null - - --$D ./src/vunify -n --manually $tmpdir/a '' $tmpdir/b '' >/dev/null --$D ./src/vunify -n --manually $tmpdir/a '' $tmpdir/c '' >/dev/null -+$builddir/src/vunify -n --manually $tmpdir/a '' $tmpdir/b '' >/dev/null -+$builddir/src/vunify -n --manually $tmpdir/a '' $tmpdir/c '' >/dev/null diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-usage.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-usage.patch deleted file mode 100644 index a63deca..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-usage.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver util-vserver-0.30.210.usage/scripts/vserver ---- util-vserver-0.30.210.orig/scripts/vserver 2005-10-28 20:29:00.000000000 +0200 -+++ util-vserver-0.30.210.usage/scripts/vserver 2006-04-13 13:44:37.000000000 +0200 -@@ -271,7 +271,7 @@ case "$2" in - fi - ;; - (*) -- echo $"Usage: $0 {start|stop|suexec|restart|condrestart|exec|enter|chkconfig|running|status}" >&2 -+ echo $"Usage: $0 <vserver> {start|stop|suexec|restart|condrestart|exec|enter|chkconfig|running|status}" >&2 - exit 2 - ;; - esac diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-vcontext-uid.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-vcontext-uid.patch deleted file mode 100644 index ae36e0b..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-vcontext-uid.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -Nurp util-vserver-0.30.210.orig/ensc_wrappers/wrappers-unistd.hc util-vserver-0.30.210.vcontext-uid/ensc_wrappers/wrappers-unistd.hc ---- util-vserver-0.30.210.orig/ensc_wrappers/wrappers-unistd.hc 2006-01-21 18:55:36.000000000 +0100 -+++ util-vserver-0.30.210.vcontext-uid/ensc_wrappers/wrappers-unistd.hc 2006-04-10 22:47:45.000000000 +0200 -@@ -156,6 +156,12 @@ Esetgroups(size_t size, const gid_t *lis - { - FatalErrnoError(setgroups(size, list)==-1, "setgroups()"); - } -+ -+inline static void -+Einitgroups(const char *user, gid_t group) -+{ -+ FatalErrnoError(initgroups(user, group)==-1, "initgroups()"); -+} - #endif - - inline static WRAPPER_DECL int -diff -Nurp util-vserver-0.30.210.orig/scripts/vserver util-vserver-0.30.210.vcontext-uid/scripts/vserver ---- util-vserver-0.30.210.orig/scripts/vserver 2005-10-28 20:29:00.000000000 +0200 -+++ util-vserver-0.30.210.vcontext-uid/scripts/vserver 2006-04-10 22:49:41.000000000 +0200 -@@ -212,15 +212,15 @@ case "$2" in - ;; - (exec) - shift 2 -- suexec root "$@" -+ suexec 0 "$@" - ;; - (chkconfig) - shift 2 -- suexec root chkconfig "$@" -+ suexec 0 chkconfig "$@" - ;; - (enter) - getEnterShell "$VSERVER_DIR" -- suexec root "${ENTER_SHELL[@]}" -+ suexec 0 "${ENTER_SHELL[@]}" - ;; - (running) - isVserverRunning "$VSERVER_DIR" -diff -Nurp util-vserver-0.30.210.orig/src/vcontext.c util-vserver-0.30.210.vcontext-uid/src/vcontext.c ---- util-vserver-0.30.210.orig/src/vcontext.c 2005-10-30 00:38:36.000000000 +0200 -+++ util-vserver-0.30.210.vcontext-uid/src/vcontext.c 2006-04-10 22:49:20.000000000 +0200 -@@ -1,6 +1,6 @@ - // $Id: vcontext.c,v 1.18 2005/04/28 18:08:12 ensc Exp $ --*- c -*-- - --// Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> -+// Copyright (C) 2004-2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - // - // This program is free software; you can redistribute it and/or modify - // it under the terms of the GNU General Public License as published by -@@ -33,6 +33,9 @@ - #include <sys/un.h> - #include <assert.h> - #include <signal.h> -+#include <sys/types.h> -+#include <pwd.h> -+#include <grp.h> - - #include <linux/personality.h> - -@@ -104,7 +107,7 @@ struct Arguments { - uint_least32_t personality_type; - int verbosity; - bool do_chroot; -- uid_t uid; -+ char const * uid; - xid_t xid; - char const * sync_sock; - char const * sync_msg; -@@ -159,7 +162,7 @@ showVersion() - WRITE_MSG(1, - "vcontext " VERSION " -- manages the creation of security contexts\n" - "This program is part of " PACKAGE_STRING "\n\n" -- "Copyright (C) 2004 Enrico Scholz\n" -+ "Copyright (C) 2004-2006 Enrico Scholz\n" - VERSION_COPYRIGHT_DISCLAIMER); - exit(0); - } -@@ -275,9 +278,35 @@ doit(struct Arguments const *args, char - if (args->do_migrate && !args->do_migrateself) - Evc_ctx_migrate(xid); - -- if (args->uid!=(uid_t)(-1) && getuid()!=args->uid) { -- Esetuid(args->uid); -- if (getuid()!=args->uid) { -+ if (args->uid != NULL) { -+ uid_t uid = 0; -+ unsigned long tmp; -+ -+ if (!isNumberUnsigned(args->uid, &tmp, false)) { -+#ifdef __dietlibc__ -+ struct passwd *pw; -+ pw = getpwnam(args->uid); -+ if (pw == NULL) { -+ WRITE_MSG(2, ENSC_WRAPPERS_PREFIX "Username '"); -+ WRITE_STR(2, args->uid); -+ WRITE_MSG(2, "' does not exist\n"); -+ return wrapper_exit_code; -+ } -+ uid = pw->pw_uid; -+ Einitgroups(args->uid, pw->pw_gid); -+ Esetgid(pw->pw_gid); -+#else -+ WRITE_MSG(2, ENSC_WRAPPERS_PREFIX "Uid '"); -+ WRITE_STR(2, args->uid); -+ WRITE_MSG(2, "' is not a number\n"); -+ return wrapper_exit_code; -+#endif -+ } -+ else -+ uid = (uid_t) tmp; -+ -+ Esetuid((uid_t) uid); -+ if (getuid()!=uid) { - WRITE_MSG(2, ENSC_WRAPPERS_PREFIX "Something went wrong while changing the UID\n"); - exit(wrapper_exit_code); - } -@@ -345,7 +374,7 @@ int main (int argc, char *argv[]) - .is_silentexist = false, - .set_namespace = false, - .verbosity = 1, -- .uid = -1, -+ .uid = NULL, - .xid = VC_DYNAMIC_XID, - .personality_type = VC_BAD_PERSONALITY, - .personality_flags = 0, -@@ -369,7 +398,7 @@ int main (int argc, char *argv[]) - case CMD_SILENTEXIST : args.is_silentexist = true; break; - case CMD_SYNCSOCK : args.sync_sock = optarg; break; - case CMD_SYNCMSG : args.sync_msg = optarg; break; -- case CMD_UID : args.uid = atol(optarg); break; -+ case CMD_UID : args.uid = optarg; break; - case CMD_XID : args.xid = Evc_xidopt2xid(optarg,true); break; - case CMD_SILENT : --args.verbosity; break; - case CMD_PERSTYPE : diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-vlogin.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-vlogin.patch deleted file mode 100644 index 4e23352..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-vlogin.patch +++ /dev/null @@ -1,501 +0,0 @@ -diff -NurpP util-vserver-0.30.210/ensc_wrappers/wrappers.h util-vserver-0.30.210-vlogin/ensc_wrappers/wrappers.h ---- util-vserver-0.30.210/ensc_wrappers/wrappers.h 2006-01-22 12:18:14.000000000 +0100 -+++ util-vserver-0.30.210-vlogin/ensc_wrappers/wrappers.h 2006-04-07 12:12:36.912449000 +0200 -@@ -111,6 +111,10 @@ - # include "wrappers-stat.hc" - #endif - -+#ifdef ENSC_WRAPPERS_TERMIOS -+# include "wrappers-termios.hc" -+#endif -+ - #undef ENSC_DETAIL2 - #undef ENSC_DETAIL1 - #undef ENSC_DOQUOTE_COND -diff -NurpP util-vserver-0.30.210/ensc_wrappers/wrappers-termios.hc util-vserver-0.30.210-vlogin/ensc_wrappers/wrappers-termios.hc ---- util-vserver-0.30.210/ensc_wrappers/wrappers-termios.hc 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-vlogin/ensc_wrappers/wrappers-termios.hc 2006-04-07 12:12:36.916449000 +0200 -@@ -0,0 +1,32 @@ -+// $Id$ --*- c -*-- -+ -+// Copyright (C) 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> -+// -+// This program is free software; you can redistribute it and/or modify -+// it under the terms of the GNU General Public License as published by -+// the Free Software Foundation; version 2 of the License. -+// -+// This program is distributed in the hope that it will be useful, -+// but WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+// GNU General Public License for more details. -+// -+// You should have received a copy of the GNU General Public License -+// along with this program; if not, write to the Free Software -+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+#ifndef H_ENSC_IN_WRAPPERS_H -+# error wrappers-termios.hc can not be used in this way -+#endif -+ -+inline static WRAPPER_DECL void -+Etcgetattr(int fd, struct termios *termios_p) -+{ -+ FatalErrnoError(tcgetattr(fd, termios_p)==-1, "tcgetattr()"); -+} -+ -+inline static WRAPPER_DECL void -+Etcsetattr(int fd, int optional_actions, struct termios *termios_p) -+{ -+ FatalErrnoError(tcsetattr(fd, optional_actions, termios_p)==-1, "tcsetattr()"); -+} -diff -NurpP util-vserver-0.30.210/Makefile.in util-vserver-0.30.210-vlogin/Makefile.in ---- util-vserver-0.30.210/Makefile.in 2006-01-22 20:33:21.000000000 +0100 -+++ util-vserver-0.30.210-vlogin/Makefile.in 2006-04-07 12:12:36.944451000 +0200 -@@ -965,7 +965,7 @@ src_testsuite_vunify_functest_DEPENDENCI - am_src_vattribute_OBJECTS = src/vattribute.$(OBJEXT) - src_vattribute_OBJECTS = $(am_src_vattribute_OBJECTS) - src_vattribute_DEPENDENCIES = $(am__DEPENDENCIES_11) --am_src_vcontext_OBJECTS = src/vcontext.$(OBJEXT) -+am_src_vcontext_OBJECTS = src/vcontext.$(OBJEXT) src/vlogin.$(OBJEXT) - src_vcontext_OBJECTS = $(am_src_vcontext_OBJECTS) - src_vcontext_DEPENDENCIES = $(am__DEPENDENCIES_11) \ - $(am__DEPENDENCIES_9) -@@ -1746,7 +1746,7 @@ src_chbind_LDFLAGS = $(VSERVER_LDFLGS) - src_chcontext_compat_SOURCES = src/chcontext.c - src_chcontext_compat_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) - src_chcontext_compat_LDFLAGS = $(VSERVER_LDFLGS) --src_vcontext_SOURCES = src/vcontext.c -+src_vcontext_SOURCES = src/vcontext.c src/vlogin.c - src_vcontext_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) - src_vcontext_LDFLAGS = $(VSERVER_LDFLGS) - src_vsched_SOURCES = src/vsched.c -@@ -3489,6 +3489,8 @@ src/vattribute$(EXEEXT): $(src_vattribut - $(LINK) $(src_vattribute_LDFLAGS) $(src_vattribute_OBJECTS) $(src_vattribute_LDADD) $(LIBS) - src/vcontext.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) -+src/vlogin.$(OBJEXT): src/$(am__dirstamp) \ -+ src/$(DEPDIR)/$(am__dirstamp) - src/vcontext$(EXEEXT): $(src_vcontext_OBJECTS) $(src_vcontext_DEPENDENCIES) src/$(am__dirstamp) - @rm -f src/vcontext$(EXEEXT) - $(LINK) $(src_vcontext_LDFLAGS) $(src_vcontext_OBJECTS) $(src_vcontext_LDADD) $(LIBS) -@@ -4222,6 +4224,7 @@ mostlyclean-compile: - -rm -f src/vdu.$(OBJEXT) - -rm -f src/vhashify.$(OBJEXT) - -rm -f src/vlimit.$(OBJEXT) -+ -rm -f src/vlogin.$(OBJEXT) - -rm -f src/vnamespace.$(OBJEXT) - -rm -f src/vps.$(OBJEXT) - -rm -f src/vreboot.$(OBJEXT) -@@ -4593,6 +4596,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vdu.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vhashify.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vlimit.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vlogin.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vnamespace.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vps.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/vreboot.Po@am__quote@ -diff -NurpP util-vserver-0.30.210/scripts/vserver.functions util-vserver-0.30.210-vlogin/scripts/vserver.functions ---- util-vserver-0.30.210/scripts/vserver.functions 2006-01-22 13:24:25.000000000 +0100 -+++ util-vserver-0.30.210-vlogin/scripts/vserver.functions 2006-04-07 12:12:36.944451000 +0200 -@@ -39,7 +39,7 @@ declare -a ENTER_SHELL=() - - declare -a OPTS_VCONTEXT_CREATE=() - declare -a OPTS_VCONTEXT_MIGRATE=() --declare -a OPTS_VCONTEXT_ENTER=() -+declare -a OPTS_VCONTEXT_ENTER=( --vlogin ) - declare -a OPTS_VATTRIBUTE=( --flag fakeinit ) - declare -a OPTS_VSCHED=() - -diff -NurpP util-vserver-0.30.210/src/Makefile-files util-vserver-0.30.210-vlogin/src/Makefile-files ---- util-vserver-0.30.210/src/Makefile-files 2006-01-22 12:28:00.000000000 +0100 -+++ util-vserver-0.30.210-vlogin/src/Makefile-files 2006-04-07 12:12:36.952452000 +0200 -@@ -167,7 +167,7 @@ src_chcontext_compat_SOURCES = src/chcon - src_chcontext_compat_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) - src_chcontext_compat_LDFLAGS = $(VSERVER_LDFLGS) - --src_vcontext_SOURCES = src/vcontext.c -+src_vcontext_SOURCES = src/vcontext.c src/vlogin.c - src_vcontext_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) - src_vcontext_LDFLAGS = $(VSERVER_LDFLGS) - -diff -NurpP util-vserver-0.30.210/src/vcontext.c util-vserver-0.30.210-vlogin/src/vcontext.c ---- util-vserver-0.30.210/src/vcontext.c 2005-10-30 00:38:36.000000000 +0200 -+++ util-vserver-0.30.210-vlogin/src/vcontext.c 2006-04-07 16:54:41.962816000 +0200 -@@ -62,6 +62,7 @@ - #define CMD_NAMESPACE 0x400d - #define CMD_PERSTYPE 0x400e - #define CMD_PERSFLAG 0x400f -+#define CMD_VLOGIN 0x4010 - - - struct option const -@@ -85,6 +86,7 @@ CMDLINE_OPTIONS[] = { - { "syncmsg", required_argument, 0, CMD_SYNCMSG }, - { "personality-type", required_argument, 0, CMD_PERSTYPE }, - { "personality-flags", required_argument, 0, CMD_PERSFLAG }, -+ { "vlogin", no_argument, 0, CMD_VLOGIN }, - #if 1 - { "fakeinit", no_argument, 0, CMD_INITPID }, // compatibility - #endif -@@ -100,6 +102,7 @@ struct Arguments { - bool is_initpid; - bool is_silentexist; - bool set_namespace; -+ bool do_vlogin; - uint_least32_t personality_flags; - uint_least32_t personality_type; - int verbosity; -@@ -112,6 +115,8 @@ struct Arguments { - - int wrapper_exit_code = 255; - -+void do_vlogin(int argc, char *argv[], int ind); -+ - static void - showHelp(int fd, char const *cmd, int res) - { -@@ -145,6 +150,7 @@ showHelp(int fd, char const *cmd, int re - " --syncmsg <message>\n" - " ... use <message> as synchronization message; by\n" - " default, 'ok' will be used\n" -+ " --vlogin ... enable terminal proxy\n" - "\n" - "'vcontext --create' exits with code 254 iff the context exists already.\n" - "\n" -@@ -233,7 +239,7 @@ doExternalSync(int fd, char const *msg) - } - - static inline ALWAYSINLINE int --doit(struct Arguments const *args, char *argv[]) -+doit(struct Arguments const *args, int argc, char *argv[]) - { - int p[2][2]; - pid_t pid = initSync(p, args->do_disconnect); -@@ -287,12 +293,15 @@ doit(struct Arguments const *args, char - sys_personality(args->personality_type | args->personality_flags)==-1) { - perror(ENSC_WRAPPERS_PREFIX "personality()"); - exit(wrapper_exit_code); -- } -+ } - - doExternalSync(ext_sync_fd, args->sync_msg); - doSyncStage1(p, args->do_disconnect); - DPRINTF("doit: pid=%u, ppid=%u\n", getpid(), getppid()); -- execvp (argv[optind],argv+optind); -+ if (!args->do_vlogin) -+ execvp (argv[optind],argv+optind); -+ else -+ do_vlogin(argc, argv, optind); - doSyncStage2(p, args->do_disconnect); - - PERROR_Q(ENSC_WRAPPERS_PREFIX "execvp", argv[optind]); -@@ -341,6 +350,7 @@ int main (int argc, char *argv[]) - .do_migrateself = false, - .do_disconnect = false, - .do_endsetup = false, -+ .do_vlogin = false, - .is_initpid = false, - .is_silentexist = false, - .set_namespace = false, -@@ -363,6 +373,7 @@ int main (int argc, char *argv[]) - case CMD_MIGRATE : args.do_migrate = true; break; - case CMD_DISCONNECT : args.do_disconnect = true; break; - case CMD_ENDSETUP : args.do_endsetup = true; break; -+ case CMD_VLOGIN : args.do_vlogin = true; break; - case CMD_INITPID : args.is_initpid = true; break; - case CMD_CHROOT : args.do_chroot = true; break; - case CMD_NAMESPACE : args.set_namespace = true; break; -@@ -408,7 +419,7 @@ int main (int argc, char *argv[]) - else if (optind>=argc) - WRITE_MSG(2, "No command given; use '--help' for more information.\n"); - else -- return doit(&args, argv); -+ return doit(&args, argc, argv); - - return wrapper_exit_code; - } -diff -NurpP util-vserver-0.30.210/src/vlogin.c util-vserver-0.30.210-vlogin/src/vlogin.c ---- util-vserver-0.30.210/src/vlogin.c 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.210-vlogin/src/vlogin.c 2006-04-07 16:55:29.201768250 +0200 -@@ -0,0 +1,281 @@ -+// $Id$ -+ -+// Copyright (C) 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> -+// Based on vserver-utils' vlogin program. -+// -+// This program is free software; you can redistribute it and/or modify -+// it under the terms of the GNU General Public License as published by -+// the Free Software Foundation; version 2 of the License. -+// -+// This program is distributed in the hope that it will be useful, -+// but WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+// GNU General Public License for more details. -+// -+// You should have received a copy of the GNU General Public License -+// along with this program; if not, write to the Free Software -+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include "util.h" -+#include <lib/vserver.h> -+#include <lib/fmt.h> -+ -+#include <stdlib.h> -+#include <getopt.h> -+#include <stdint.h> -+#include <strings.h> -+#include <errno.h> -+#include <sys/stat.h> -+#include <sys/ioctl.h> -+#include <sys/wait.h> -+#include <sys/socket.h> -+#include <termios.h> -+#include <signal.h> -+#include <pty.h> -+#include <fcntl.h> -+ -+#define ENSC_WRAPPERS_PREFIX "vlogin: " -+#define ENSC_WRAPPERS_IOCTL 1 -+#define ENSC_WRAPPERS_UNISTD 1 -+#define ENSC_WRAPPERS_SOCKET 1 -+#define ENSC_WRAPPERS_IO 1 -+#define ENSC_WRAPPERS_TERMIOS 1 -+#define ENSC_WRAPPERS_FCNTL 1 -+#include <wrappers.h> -+ -+struct terminal { -+ int fd; /* terminal file descriptor */ -+ struct termios term; /* terminal settings */ -+ struct winsize ws; /* terminal size */ -+ pid_t pid; /* terminal process id */ -+ struct termios termo; /* original terminal settings */ -+ enum { TS_RESET, TS_RAW } state; /* terminal state */ -+}; -+ -+static struct terminal t; -+extern int wrapper_exit_code; -+ -+/* set terminal to raw mode */ -+static void -+terminal_raw(void) -+{ -+ struct termios buf; -+ -+ /* save original terminal settings */ -+ Etcgetattr(STDIN_FILENO, &t.termo); -+ -+ buf = t.termo; -+ -+ /* convert terminal settings to raw mode */ -+ cfmakeraw(&buf); -+ -+ /* apply raw terminal settings */ -+ Etcsetattr(STDIN_FILENO, TCSAFLUSH, &buf); -+ -+ t.state = TS_RAW; -+} -+ -+/* reset terminal to original state */ -+static void -+terminal_reset(void) -+{ -+ if (t.state != TS_RAW) -+ return; -+ -+ Etcsetattr(STDIN_FILENO, TCSAFLUSH, &t.termo); -+ -+ t.state = TS_RESET; -+} -+ -+/* send signal to terminal */ -+static void -+terminal_kill(int sig) -+{ -+ pid_t pgrp = -1; -+ -+ /* try to get process group leader */ -+ if (ioctl(t.fd, TIOCGPGRP, &pgrp) >= 0 && -+ pgrp != -1 && -+ kill(-pgrp, sig) != -1) -+ return; -+ -+ /* fallback using terminal pid */ -+ kill(-t.pid, sig); -+} -+ -+/* redraw the terminal screen */ -+static void -+terminal_redraw(void) -+{ -+ /* get winsize from stdin */ -+ if (ioctl(STDIN_FILENO, TIOCGWINSZ, &t.ws) == -1) -+ return; -+ -+ /* set winsize in terminal */ -+ ioctl(t.fd, TIOCSWINSZ, &t.ws); -+ -+ /* set winsize change signal to terminal */ -+ terminal_kill(SIGWINCH); -+} -+ -+/* copy terminal activities */ -+static void -+terminal_copy(int src, int dst) -+{ -+ char buf[64]; -+ size_t len; -+ -+ /* read terminal activity */ -+ len = Eread(src, buf, sizeof(buf)); -+ -+ /* write activity to user */ -+ EwriteAll(dst, buf, len); -+} -+ -+/* shuffle all output, and reset the terminal */ -+static void -+terminal_end(void) -+{ -+ char buf[64]; -+ ssize_t len; -+ long options; -+ -+ options = Efcntl(t.fd, F_GETFL, 0) | O_NONBLOCK; -+ Efcntl(t.fd, F_SETFL, options); -+ for (;;) { -+ len = read(t.fd, buf, sizeof(buf)); -+ if (len == 0 || len == -1) -+ break; -+ EwriteAll(STDOUT_FILENO, buf, len); -+ } -+ -+ /* in case atexit hasn't been setup yet */ -+ terminal_reset(); -+} -+ -+/* catch signals */ -+static void -+signal_handler(int sig) -+{ -+ int status; -+ -+ switch(sig) { -+ /* catch interrupt */ -+ case SIGINT: -+ terminal_kill(sig); -+ break; -+ -+ /* terminal died */ -+ case SIGCHLD: -+ terminal_end(); -+ wait(&status); -+ exit(WEXITSTATUS(status)); -+ break; -+ -+ /* window size has changed */ -+ case SIGWINCH: -+ terminal_redraw(); -+ break; -+ -+ default: -+ exit(0); -+ } -+ -+} -+ -+void do_vlogin(int argc, char *argv[], int ind) -+{ -+ int slave; -+ pid_t pid; -+ int n, i; -+ fd_set rfds; -+ -+ if (!isatty(0) || !isatty(1)) { -+ execvp(argv[ind], argv+ind); -+ return; -+ } -+ -+ /* set terminal to raw mode */ -+ terminal_raw(); -+ -+ /* fork new pseudo terminal */ -+ if (openpty(&t.fd, &slave, NULL, NULL, NULL) == -1) { -+ perror(ENSC_WRAPPERS_PREFIX "openpty()"); -+ exit(EXIT_FAILURE); -+ } -+ -+ /* setup SIGCHLD here, so we're sure to get the signal */ -+ signal(SIGCHLD, signal_handler); -+ -+ pid = Efork(); -+ -+ if (pid == 0) { -+ /* we don't need the master side of the terminal */ -+ close(t.fd); -+ -+ /* login_tty() stupid dietlibc doesn't have it */ -+ Esetsid(); -+ -+ Eioctl(slave, TIOCSCTTY, NULL); -+ -+ Edup2(slave, 0); -+ Edup2(slave, 1); -+ Edup2(slave, 2); -+ -+ if (slave > 2) -+ close(slave); -+ -+ Eexecvp(argv[ind], argv+ind); -+ } -+ -+ /* setup SIGINT and SIGWINCH here, as they can cause loops in the child */ -+ signal(SIGWINCH, signal_handler); -+ signal(SIGINT, signal_handler); -+ -+ /* save terminals pid */ -+ t.pid = pid; -+ -+ /* set process title for ps */ -+ n = strlen(argv[0]); -+ -+ for (i = 0; i < argc; i++) -+ bzero(argv[i], strlen(argv[i])); -+ -+ strncpy(argv[0], "login", n); -+ -+ /* reset terminal to its original mode */ -+ atexit(terminal_reset); -+ -+ /* we want a redraw */ -+ terminal_redraw(); -+ -+ /* main loop */ -+ for (;;) { -+ /* init file descriptors for select */ -+ FD_ZERO(&rfds); -+ FD_SET(STDIN_FILENO, &rfds); -+ FD_SET(t.fd, &rfds); -+ n = t.fd; -+ -+ /* wait for something to happen */ -+ while (select(n + 1, &rfds, NULL, NULL, NULL) == -1) { -+ if (errno == EINTR || errno == EAGAIN) -+ continue; -+ perror(ENSC_WRAPPERS_PREFIX "select()"); -+ exit(wrapper_exit_code); -+ } -+ -+ if (FD_ISSET(STDIN_FILENO, &rfds)) -+ terminal_copy(STDIN_FILENO, t.fd); -+ -+ if (FD_ISSET(t.fd, &rfds)) -+ terminal_copy(t.fd, STDOUT_FILENO); -+ } -+ -+ /* never get here, signal handler exits */ -+} diff --git a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-vprocunhide-fix.patch b/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-vprocunhide-fix.patch deleted file mode 100644 index 5e0bf95..0000000 --- a/util-vserver/patches/0.30.210-r12/util-vserver-0.30.210-vprocunhide-fix.patch +++ /dev/null @@ -1,9 +0,0 @@ -Index: util-vserver-0.30.210/distrib/misc/vprocunhide-files -=================================================================== ---- util-vserver-0.30.210.orig/distrib/misc/vprocunhide-files -+++ util-vserver-0.30.210/distrib/misc/vprocunhide-files -@@ -28,3 +28,4 @@ - /proc/uptime - -/proc/cmdline - /proc/version -+/proc/mounts |