ALT Linux Sisyphus - Пакет util-vserver

diff -uNpar --minimal util-vserver-0.30.210.orig/distrib/altSisyphus/apt/apt.conf util-vserver-0.30.210/distrib/altSisyphus/apt/apt.conf

--- util-vserver-0.30.210.orig/distrib/altSisyphus/apt/apt.conf	1970-01-01 03:00:00 +0300
+++ util-vserver-0.30.210/distrib/altSisyphus/apt/apt.conf	2006-03-25 15:05:07 +0300
@@ -0,0 +1,22 @@
+/*
+ * This is the main configuration file for the APT suite of tools,
+ * see apt.conf(5) for details.
+ */
+
+// See apt-cdrom(8) for details.
+Acquire::CDROM::Copy "true";
+Acquire::CDROM::mount "/media/cdrom";
+
+RPM 
+{
+	Allow-Duplicated {
+		// Old-style kernels.
+		"^(NVIDIA_)?(kernel|alsa)[0-9]*(-adv|-linus)?($|-up|-smp|-secure|-custom|-enterprise|-BOOT|-tape|-aureal)";
+		// New-style kernels.
+		"^kernel-(image|modules)-.*";
+	};
+	Hold {
+		// Old-style kernels.
+		"^(kernel|alsa)[0-9]+-source";
+	};
+};
diff -uNpar --minimal util-vserver-0.30.210.orig/distrib/altSisyphus/apt/pkgpriorities util-vserver-0.30.210/distrib/altSisyphus/apt/pkgpriorities
--- util-vserver-0.30.210.orig/distrib/altSisyphus/apt/pkgpriorities	1970-01-01 03:00:00 +0300
+++ util-vserver-0.30.210/distrib/altSisyphus/apt/pkgpriorities	2006-03-25 15:05:07 +0300
@@ -0,0 +1,12 @@
+Important:
+  basesystem
+Required:
+  apt
+Standard:
+  kernel-doc
+  libpam0
+  libpam0-devel
+  maxima-bin-gcl
+  postfix
+  python-dev
+  python-modules-tkinter
diff -uNpar --minimal util-vserver-0.30.210.orig/distrib/altSisyphus/apt/rpmpriorities util-vserver-0.30.210/distrib/altSisyphus/apt/rpmpriorities
--- util-vserver-0.30.210.orig/distrib/altSisyphus/apt/rpmpriorities	1970-01-01 03:00:00 +0300
+++ util-vserver-0.30.210/distrib/altSisyphus/apt/rpmpriorities	2006-03-25 15:05:07 +0300
@@ -0,0 +1,12 @@
+Important:
+  basesystem
+Required:
+  apt
+Standard:
+  kernel-doc
+  libpam0
+  libpam0-devel
+  maxima-bin-gcl
+  postfix
+  python-dev
+  python-modules-tkinter
diff -uNpar --minimal util-vserver-0.30.210.orig/distrib/altSisyphus/apt/sources.list util-vserver-0.30.210/distrib/altSisyphus/apt/sources.list
--- util-vserver-0.30.210.orig/distrib/altSisyphus/apt/sources.list	1970-01-01 03:00:00 +0300
+++ util-vserver-0.30.210/distrib/altSisyphus/apt/sources.list	2006-03-25 15:05:07 +0300
@@ -0,0 +1,9 @@
+# Emacs, highlight the comments, please: -*- mode: Sh; -*- !
+# Package repository URLs 
+#
+# Signed repositories have a [alt]
+# If you remove it, no digital signature check will be made!
+
+# Sisyphus
+rpm [alt] ftp://ftp.altlinux.com/pub/distributions/ALTLinux/Sisyphus i586 classic
+rpm-src [alt] ftp://ftp.altlinux.com/pub/distributions/ALTLinux/Sisyphus i586 classic
diff -uNpar --minimal util-vserver-0.30.210.orig/distrib/altSisyphus/devs util-vserver-0.30.210/distrib/altSisyphus/devs
--- util-vserver-0.30.210.orig/distrib/altSisyphus/devs	1970-01-01 03:00:00 +0300
+++ util-vserver-0.30.210/distrib/altSisyphus/devs	2006-03-25 15:09:27 +0300
@@ -0,0 +1,8 @@
+null    c 1 3 666
+zero    c 1 5 666
+full    c 1 7 666
+random  c 1 8 644
+urandom c 1 9 644
+tty     c 5 0 666
+tty12	c 4 12 666
+ptmx    c 5 2 666
diff -uNpar --minimal util-vserver-0.30.210.orig/distrib/altSisyphus/initpost util-vserver-0.30.210/distrib/altSisyphus/initpost
--- util-vserver-0.30.210.orig/distrib/altSisyphus/initpost	1970-01-01 03:00:00 +0300
+++ util-vserver-0.30.210/distrib/altSisyphus/initpost	2006-03-25 17:44:59 +0300
@@ -0,0 +1,104 @@
+#! /bin/bash
+
+# Copyright (C) 2003 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.
+
+## HACK: this script is full of races...
+
+vdir=$1/vdir
+. "$2"
+
+function relink
+{
+    test ! -e "$2" -o -L "$2" || mv -f "$2"{,.orig}
+    ln -sf "$1" "$2"
+}
+
+## Usage: subst <file> <regexp>
+function subst
+{
+    tmp=$(mktemp /tmp/initpost-subst.XXXXXX)
+
+    case "$1" in
+	(/*|./*)	cat "$1";;
+	(*)		$_CHROOT_SH cat "$1";;
+    esac              | sed -e "$2"          >$tmp
+    cmp -s $tmp "$1" || $_CHROOT_SH truncate "$1" <$tmp
+
+    rm -f $tmp
+}
+
+vserver=$1
+
+## Do some magic to set the vserver into a defined state
+$_VSERVER "$vserver" stop  &>/dev/null || :
+$_VSERVER "$vserver" start --rescue bash -c '
+    exec  >/dev/null
+    exec 2>/dev/null
+
+    set -x
+    f=/tmp/startwait
+    trap "rm -f $f" EXIT
+    mkfifo $f
+    ( sleep 10; kill -s 9 -- -1 ) &
+    cat "$f" >/dev/null
+    kill -s 9 -- -1
+    wait
+'
+
+pushd "$vdir"/etc/init.d &>/dev/null ||
+    pushd "$vdir"/etc/rc.d/init.d &>/dev/null || exit 1
+
+    for i in *; do
+	test -e "$i" || continue
+	case "$i" in
+	    functions*|halt|killall|single|template|local|clock|outformat) ;;
+	    syslog*) ;;
+	    *)
+		$_VSERVER "$1" chkconfig "$i" off
+		;;
+	esac
+    done
+
+popd >/dev/null
+
+pushd "$vdir"/usr/bin &>/dev/null
+    relink /bin/true rhgb-client
+popd >/dev/null
+
+pushd "$vdir" &>/dev/null
+    echo 'NETWORKING=yes' | $_CHROOT_SH append /etc/sysconfig/network
+popd >/dev/null
+
+pushd "$vdir" &>/dev/null
+    cat <<EOF | $_CHROOT_SH truncate /etc/init.d/halt
+#! /bin/bash
+
+exec /sbin/killall5 -15
+EOF
+    # TODO: remove race/symlink-attack
+    chmod +x etc/init.d/halt
+    
+    : | $_CHROOT_SH truncate /etc/sysctl.conf
+    echo "none    /       none    defaults" | $_CHROOT_SH truncate /etc/fstab
+    cat "$__DISTRIBDIR"/redhat/rc.sysinit   | $_CHROOT_SH truncate /etc/rc.d/rc.sysinit.vserver
+    # TODO: remove race/symlink-attack
+    chmod +x etc/rc.d/rc.sysinit.vserver
+    subst etc/inittab 's!^\([^#].*:respawn:.* tty\)!#\1!;
+		       s!si::sysinit:/etc/rc.d/rc.sysinit!si::sysinit:/etc/rc.d/rc.sysinit.vserver!'
+popd >/dev/null
+
+$_VSERVER "$vserver" exec bash -c ': >/tmp/startwait' &>/dev/null || :
+$_VSERVER "$vserver" stop &>/dev/null || :
diff -uNpar --minimal util-vserver-0.30.210.orig/distrib/altSisyphus/initpre util-vserver-0.30.210/distrib/altSisyphus/initpre
--- util-vserver-0.30.210.orig/distrib/altSisyphus/initpre	1970-01-01 03:00:00 +0300
+++ util-vserver-0.30.210/distrib/altSisyphus/initpre	2006-03-25 17:42:43 +0300
@@ -0,0 +1,22 @@
+#! /bin/bash
+
+# Copyright (C) 2003 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.
+
+vdir=$1/vdir
+. "$2"
+
+## Fix/workaround the misclassification of %_netsharedpath's parent directories
+mkdir -p "$vdir"/{etc/rc.d/init.d,/sbin,/usr/bin}
diff -uNpar --minimal util-vserver-0.30.210.orig/distrib/altSisyphus/pkgs/01 util-vserver-0.30.210/distrib/altSisyphus/pkgs/01
--- util-vserver-0.30.210.orig/distrib/altSisyphus/pkgs/01	1970-01-01 03:00:00 +0300
+++ util-vserver-0.30.210/distrib/altSisyphus/pkgs/01	2006-03-25 15:05:07 +0300
@@ -0,0 +1,3 @@
+glibc
+startup
+basesystem
\ В конце файла нет новой строки
diff -uNpar --minimal util-vserver-0.30.210.orig/distrib/altSisyphus/pkgs/02 util-vserver-0.30.210/distrib/altSisyphus/pkgs/02
--- util-vserver-0.30.210.orig/distrib/altSisyphus/pkgs/02	1970-01-01 03:00:00 +0300
+++ util-vserver-0.30.210/distrib/altSisyphus/pkgs/02	2006-03-25 15:05:07 +0300
@@ -0,0 +1,3 @@
+--reinstall
+
+filesystem
diff -uNpar --minimal util-vserver-0.30.210.orig/distrib/Makefile.am util-vserver-0.30.210/distrib/Makefile.am
--- util-vserver-0.30.210.orig/distrib/Makefile.am	2005-10-28 21:53:49 +0400
+++ util-vserver-0.30.210/distrib/Makefile.am	2006-03-25 21:30:56 +0300
@@ -29,13 +29,18 @@ defaults_DATA =		misc/debootstrap.uri \
 
 nobase_distrib_SCRIPTS	=  redhat/initpost \
 			   redhat/initpre \
-			   redhat/rc.sysinit
+			   redhat/rc.sysinit \
+			   altSisyphus/initpost \
+			   altSisyphus/initpre
+			   
 
 nobase_distrib_DATA	=  defaults/devs \
 			   defaults/apt.conf \
 			   defaults/rpm/macros \
 			   defaults/apt/apt.conf \
 			   template/initpost template/initpre \
+			   altSisyphus/apt/pkgpriorities altSisyphus/pkgs/01 altSisyphus/pkgs/02 \
+			   altSisyphus/devs \
 			   rh9/apt/rpmpriorities    rh9/pkgs/01    rh9/pkgs/02 \
 			   fc1/apt/rpmpriorities    fc1/pkgs/01    fc1/pkgs/02 \
 			   fc2/apt/rpmpriorities    fc2/pkgs/01    fc2/pkgs/02 \
@@ -55,6 +60,7 @@ nobase_confdistrib_DATA	=  rh9/apt/sourc
 			   fc2/apt/sources.list \
 			   fc3/apt/sources.list \
 			   fc4/apt/sources.list \
+			   altSisyphus/apt/sources.list \
 			   suse91/apt/sources.list
 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
diff -uNpar --minimal util-vserver-0.30.210.orig/scripts/functions util-vserver-0.30.210/scripts/functions
--- util-vserver-0.30.210.orig/scripts/functions	2006-01-22 15:24:25 +0300
+++ util-vserver-0.30.210/scripts/functions	2006-03-25 21:39:36 +0300
@@ -213,7 +213,7 @@ function colpanic
     if test -n "$_VS_ERRFILE"; then
 	echo "$@" >>"$_VS_ERRFILE"
     else
-	colorize error echo -n "$@" >&2
+	colorize error echo "$@" >&2
     fi
     echo
 
@@ -408,8 +408,11 @@ function _pkgSetEnvBase
 	PATH=$EXECDIR:$PATH
 	LD_LIBRARY_PATH=$EXECDIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
     }
+    # workaround for pam_mktemp
+    test -z "$TMPDIR" || TMPDIR=/tmp
+    test -z "$TMP" || TMP=/tmp
 
-    export PATH LD_LIBRARY_PATH
+    export PATH LD_LIBRARY_PATH TMPDIR TMP
 }
 
 function _pkgSetEnvApt
@@ -701,7 +704,7 @@ function pkgmgmt.guessStyle()
 
     if test -n "$_pgs_cfgdir" -a -e "$_pgs_cfgdir"/style; then
 	read style <"$_pgs_cfgdir"/style
-    elif test -e "$_pgs_vdir"/etc/redhat-release -o -e "$_pgs_vdir"/etc/fedora-release; then
+    elif test -e "$_pgs_vdir"/etc/redhat-release -o -e "$_pgs_vdir"/etc/fedora-release -o -e "$_pgs_vdir"/etc/altlinux-release; then
 	style=redhat
     elif test -e "$_pgs_vdir"/etc/mandrake-release; then
 	style=mandrake
diff -uNpar --minimal util-vserver-0.30.210.orig/scripts/vapt-get-worker util-vserver-0.30.210/scripts/vapt-get-worker
--- util-vserver-0.30.210.orig/scripts/vapt-get-worker	2005-03-21 23:03:30 +0300
+++ util-vserver-0.30.210/scripts/vapt-get-worker	2006-03-25 16:40:18 +0300
@@ -52,7 +52,7 @@ exec ${_APT_GET:-apt-get} \
     -o "Dir::Cache=$APTCACHEDIR" \
     -o "Dir::Cache::archives=$APTARCHIVDIR" \
     -o "Dir::Bin::rpm=$RPM_BINARY" \
-    -o "Dir::Etc=$APTETCDIR" \
+    -o "Dir::Etc=$APTETCDIR/" \
     -o "RPM::Order=true" \
     -o "RPM::PM=external" \
     "$@"
diff -uNpar --minimal util-vserver-0.30.210.orig/scripts/vserver-build.functions util-vserver-0.30.210/scripts/vserver-build.functions
--- util-vserver-0.30.210.orig/scripts/vserver-build.functions	2006-01-22 15:09:39 +0300
+++ util-vserver-0.30.210/scripts/vserver-build.functions	2006-03-25 15:05:07 +0300
@@ -141,6 +141,9 @@ function getDistribution
 	if test -e /etc/fedora-release; then
 	    set -- $(cat /etc/fedora-release)
 	    DISTRIBUTION=fdr$4
+	elif test -e /etc/altlinux-release; then
+	    set -- $(cat /etc/altlinux-release)
+	    DISTRIBUTION=alt$3
 	elif test -e /etc/redhat-release; then
 	    set -- $(cat /etc/redhat-release)
 	    DISTRIBUTION=rh$5

4.0:	0.30.210-alt2
3.0:	0.30-alt1.1
+backports:	0.30.210-alt0.M30.1