---- util-vserver-0.30.214/distrib/Makefile.am 2008-03-25 22:59:35.515771366 +0200
-+++ util-vserver-0.30.214/distrib/Makefile.am 2008-03-25 23:22:53.714374272 +0200
-@@ -42,6 +42,7 @@
+diff -urN util-vserver-0.30.216-r2837.orig/distrib/defaults/poldek/poldek.conf util-vserver-0.30.216-r2837/distrib/defaults/poldek/poldek.conf
+--- util-vserver-0.30.216-r2837.orig/distrib/defaults/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/defaults/poldek/poldek.conf 2009-06-22 17:48:26.000000000 +0200
+@@ -0,0 +1,11 @@
++# poldek configuration file.
++
++%includedir repos.d
++
++[global]
++particle install = no
++choose equivalents manually = yes
++unique package names = yes
++
++#hold =
++ignore = kernel* udev devfs
+diff -urN util-vserver-0.30.216-r2837.orig/distrib/Makefile.am util-vserver-0.30.216-r2837/distrib/Makefile.am
+--- util-vserver-0.30.216-r2837.orig/distrib/Makefile.am 2009-06-22 17:36:52.000000000 +0200
++++ util-vserver-0.30.216-r2837/distrib/Makefile.am 2009-06-22 17:49:36.000000000 +0200
+@@ -45,6 +45,7 @@
defaults/apt.conf \
defaults/rpm/macros \
defaults/apt/apt.conf \
template/initpost template/initpre \
rh9/apt/rpmpriorities rh9/pkgs/01 rh9/pkgs/02 \
fc1/apt/rpmpriorities fc1/pkgs/01 fc1/pkgs/02 \
-@@ -85,7 +85,10 @@
+@@ -85,7 +86,10 @@
suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \
suse91/rpm/macros \
gentoo/init-vserver.sh gentoo/net.vserver \
- gentoo/reboot.sh gentoo/shutdown.sh
-+ gentoo/reboot.sh gentoo/shutdown.sh \
++ gentoo/reboot.sh gentoo/shutdown.sh\
+ pld-ac/pkgs/01 pld-ac/rpm/macros \
+ pld-th/pkgs/01 pld-th/rpm/macros \
+ pld-ti/pkgs/01 pld-ti/rpm/macros
nobase_confdistrib_DATA = rh9/apt/sources.list \
fc1/apt/sources.list \
-@@ -83,7 +87,10 @@
+@@ -95,7 +99,10 @@
fc5/apt/sources.list \
fc6/apt/sources.list \
f7/apt/sources.list \
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
= $(nobase_distrib_SCRIPTS)
---- /dev/null 2007-11-07 17:05:30.000000000 +0200
-+++ util-vserver-0.30.214/distrib/defaults/poldek/poldek.conf 2008-03-25 19:36:58.721331962 +0200
-@@ -0,0 +1,11 @@
-+# poldek configuration file.
-+
-+%includedir repos.d
-+
-+[global]
-+particle install = no
-+choose equivalents manually = yes
-+unique package names = yes
-+
-+#hold =
-+ignore = kernel* udev devfs
---- util-vserver-0.30.214/distrib/pld-ac/pkgs/01 2007-11-15 23:20:48.181172125 +0100
-+++ util-vserver-0.30.214/distrib/pld-ac/pkgs/01 2008-03-25 23:05:18.538916218 +0200
+diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ac/pkgs/01 util-vserver-0.30.216-r2837/distrib/pld-ac/pkgs/01
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-ac/pkgs/01 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,6 @@
+basesystem
+filesystem
+issue
+rpm-base
+vserver-packages
---- util-vserver-0.30.214/distrib/pld-ac/poldek/repos.d/pld.conf 2007-11-15 23:20:48.181172125 +0100
-+++ util-vserver-0.30.214/distrib/pld-ac/poldek/repos.d/pld.conf 2008-03-25 20:34:12.000000000 +0200
+diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ac/poldek/repos.d/pld.conf util-vserver-0.30.216-r2837/distrib/pld-ac/poldek/repos.d/pld.conf
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-ac/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,56 @@
+# $Id$
+# PLD Linux Distribution <http://www.pld-linux.org/>.
+path = %{_pld_main_prefix}/test/%{_arch}/
+auto = no
+autoup = no
---- util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2007-11-15 23:20:48.181172125 +0100
-+++ util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2008-04-29 23:36:23.674175489 +0300
+diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ac/rpm/macros util-vserver-0.30.216-r2837/distrib/pld-ac/rpm/macros
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-ac/rpm/macros 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,6 @@
+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
+# you have to use at least one language beside 'C'
+%_netsharedpath /dev
+%_tmppath /tmp
+%_host_os %_os
---- util-vserver-0.30.214/distrib/pld-th/pkgs/01 2007-11-15 23:20:48.181172125 +0100
-+++ util-vserver-0.30.214/distrib/pld-th/pkgs/01 2008-03-25 23:05:18.538916218 +0200
+diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-th/pkgs/01 util-vserver-0.30.216-r2837/distrib/pld-th/pkgs/01
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-th/pkgs/01 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,6 @@
+basesystem
+filesystem
+issue
+rpm-base
+vserver-packages
---- util-vserver-0.30.214/distrib/pld-th/poldek/repos.d/pld.conf 2007-11-15 23:20:48.181172125 +0100
-+++ util-vserver-0.30.214/distrib/pld-th/poldek/repos.d/pld.conf 2008-03-26 00:27:05.335185240 +0200
+diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-th/poldek/repos.d/pld.conf util-vserver-0.30.216-r2837/distrib/pld-th/poldek/repos.d/pld.conf
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-th/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-th/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,65 @@
+# PLD Linux Distribution <http://www.pld-linux.org/>.
+
+path = %{_prefix}/test/noarch/RPMS/
+auto = no
+autoup = no
---- util-vserver-0.30.214.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/distrib/pld-th/rpm/macros 2007-11-15 23:20:48.184505622 +0100
+diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-th/rpm/macros util-vserver-0.30.216-r2837/distrib/pld-th/rpm/macros
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-th/rpm/macros 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,6 @@
+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
+# you have to use at least one language beside 'C'
+%_netsharedpath /dev
+%_tmppath /tmp
+%_host_os %_os
---- util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2007-11-15 23:20:48.181172125 +0100
-+++ util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2008-03-25 23:05:18.538916218 +0200
+diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ti/pkgs/01 util-vserver-0.30.216-r2837/distrib/pld-ti/pkgs/01
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-ti/pkgs/01 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-ti/pkgs/01 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,6 @@
+basesystem
+filesystem
+issue
+rpm-base
+vserver-packages
---- util-vserver-0.30.214.org/distrib/pld-ti/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/distrib/pld-ti/poldek/repos.d/pld.conf 2007-11-15 23:20:48.217840583 +0100
+diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ti/poldek/repos.d/pld.conf util-vserver-0.30.216-r2837/distrib/pld-ti/poldek/repos.d/pld.conf
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-ti/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-ti/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,46 @@
+# PLD Titanium
+# Unofficial version of PLD Linux Distribution
+path = %{_prefix}/test/noarch/RPMS/
+auto = no
+autoup = no
---- util-vserver-0.30.214.org/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/distrib/pld-ti/rpm/macros 2007-11-15 23:20:48.221174080 +0100
+diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ti/rpm/macros util-vserver-0.30.216-r2837/distrib/pld-ti/rpm/macros
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-ti/rpm/macros 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,6 @@
+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
+# you have to use at least one language beside 'C'
+%_netsharedpath /dev
+%_tmppath /tmp
+%_host_os %_os
---- util-vserver-0.30.214.org/scripts/functions 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/functions 2007-11-15 23:20:48.221174080 +0100
+diff -urN util-vserver-0.30.216-r2837.orig/scripts/functions util-vserver-0.30.216-r2837/scripts/functions
+--- util-vserver-0.30.216-r2837.orig/scripts/functions 2009-06-22 17:36:35.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/functions 2009-06-22 17:48:26.000000000 +0200
@@ -403,6 +403,20 @@
fi
}
*) echo "Unknown packaging flavor" >&2; exit 1;;
esac
done
-@@ -764,6 +779,8 @@
+@@ -770,6 +785,8 @@
style=redhat
elif test -e "$_pgs_vdir"/etc/mandrake-release; then
style=mandrake
elif test -e "$_pgs_vdir"/etc/debian_version; then
style=debian
elif test -e "$_pgs_vdir"/etc/SuSE-release; then
-@@ -831,6 +848,27 @@
+@@ -837,6 +854,27 @@
test -n "$have_yum" && return 0 || return 1
}
function vshelper.doSanityCheck
{
---- util-vserver-0.30.214.org/scripts/Makefile-files 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/Makefile-files 2007-11-15 23:20:48.221174080 +0100
+diff -urN util-vserver-0.30.216-r2837.orig/scripts/Makefile-files util-vserver-0.30.216-r2837/scripts/Makefile-files
+--- util-vserver-0.30.216-r2837.orig/scripts/Makefile-files 2009-06-22 17:36:35.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/Makefile-files 2009-06-22 17:48:26.000000000 +0200
@@ -21,6 +21,7 @@
scripts/vapt-get-worker \
scripts/vrpm-worker \
scripts/vrpm-preload \
scripts/save_s_context \
scripts/vservers.grabinfo.sh \
-@@ -47,11 +48,13 @@
+@@ -48,11 +49,13 @@
scripts/vserver-build.template \
scripts/vserver-build.rsync \
scripts/vserver-build.clone \
scripts/vserver-setup.functions \
scripts/vserver.functions \
scripts/vserver.start \
-@@ -65,6 +68,7 @@
+@@ -66,6 +69,7 @@
scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \
scripts/vapt-get-worker \
scripts/vpkg \
scripts/vrpm-worker \
scripts/vrpm-preload \
scripts/start-vservers \
-@@ -88,6 +92,7 @@
+@@ -89,6 +93,7 @@
scripts_sbin_src_PRGS = scripts/chbind \
scripts/chcontext \
scripts/vapt-get \
scripts/vdispatch-conf \
scripts/vemerge \
scripts/vesync \
---- util-vserver-0.30.214.org/scripts/pkgmgmt 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/pkgmgmt 2007-11-15 23:20:48.221174080 +0100
+diff -urN util-vserver-0.30.216-r2837.orig/scripts/pkgmgmt util-vserver-0.30.216-r2837/scripts/pkgmgmt
+--- util-vserver-0.30.216-r2837.orig/scripts/pkgmgmt 2009-06-22 17:36:34.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/pkgmgmt 2009-06-22 17:48:26.000000000 +0200
@@ -195,7 +195,7 @@
"
(debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";;
(*)
echo $"Vserver style '$style' is not supported for packagemanagment" >&2
---- util-vserver-0.30.214.org/scripts/util-vserver-vars.pathsubst 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/util-vserver-vars.pathsubst 2007-11-15 23:20:48.221174080 +0100
-@@ -53,6 +53,7 @@
+diff -urN util-vserver-0.30.216-r2837.orig/scripts/util-vserver-vars.pathsubst util-vserver-0.30.216-r2837/scripts/util-vserver-vars.pathsubst
+--- util-vserver-0.30.216-r2837.orig/scripts/util-vserver-vars.pathsubst 2009-06-22 17:36:34.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/util-vserver-vars.pathsubst 2009-06-22 17:48:26.000000000 +0200
+@@ -54,6 +54,7 @@
_LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKGLIBDIR/vserver-build.functions.rpm"
_LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGLIBDIR/vserver-build.functions.yum"
_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGLIBDIR/vserver-build.functions.pkgmgmt"
_LISTDEVIP="$__LEGACYDIR/listdevip"
_LOCKFILE="$__PKGLIBDIR/lockfile"
_MASK2PREFIX="$__PKGLIBDIR/mask2prefix"
-@@ -105,6 +106,8 @@
+@@ -109,6 +110,8 @@
_VUNIFY="$__PKGLIBDIR/vunify"
_VYUM="$__SBINDIR/vyum"
_VYUM_WORKER="$__PKGLIBDIR/vyum-worker"
_AWK="@AWK@"
_BZIP2="@BZIP2@"
---- util-vserver-0.30.214.org/scripts/vpkg 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/vpkg 2007-11-15 23:20:48.221174080 +0100
+diff -urN util-vserver-0.30.216-r2837.orig/scripts/vpkg util-vserver-0.30.216-r2837/scripts/vpkg
+--- util-vserver-0.30.216-r2837.orig/scripts/vpkg 2009-06-22 17:36:34.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/vpkg 2009-06-22 17:48:26.000000000 +0200
@@ -115,6 +115,44 @@
fi
fi
(debian)
case "$tag" in
(get-conffiles)
---- util-vserver-0.30.214.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/scripts/vpoldek 2007-11-15 22:00:24.000000000 +0100
+diff -urN util-vserver-0.30.216-r2837.orig/scripts/vpoldek util-vserver-0.30.216-r2837/scripts/vpoldek
+--- util-vserver-0.30.216-r2837.orig/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/scripts/vpoldek 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,74 @@
+#! /bin/bash
+# $Id$
+
+test ${#poldek_opts[@]} -eq 0 || poldek_opts=( "${poldek_opts[@]}" -- )
+exec $_VSOMETHING "${send_through[@]}" poldek "${poldek_opts[@]}" "$@"
---- util-vserver-0.30.214.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/scripts/vpoldek-worker 2007-11-15 22:58:23.000000000 +0100
+diff -urN util-vserver-0.30.216-r2837.orig/scripts/vpoldek-worker util-vserver-0.30.216-r2837/scripts/vpoldek-worker
+--- util-vserver-0.30.216-r2837.orig/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/scripts/vpoldek-worker 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,45 @@
+#! /bin/bash
+# $Id$
+ --conf=$POLDEK_CONFIG \
+ --pmcmd=$RPM_BINARY \
+ "$@"
---- util-vserver-0.30.214.org/scripts/vserver-build 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/vserver-build 2007-11-15 23:20:48.224507577 +0100
+diff -urN util-vserver-0.30.216-r2837.orig/scripts/vserver-build util-vserver-0.30.216-r2837/scripts/vserver-build
+--- util-vserver-0.30.216-r2837.orig/scripts/vserver-build 2009-06-22 17:36:34.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/vserver-build 2009-06-22 17:48:26.000000000 +0200
@@ -57,6 +57,9 @@
yum ... -- -d <distribution>
... installs the base-packages of the given distribution with
. $__PKGLIBDIR/vserver-build.$method
;;
(x) panic $"No build-method specified";;
---- util-vserver-0.30.214.org/scripts/vserver-build.functions 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/vserver-build.functions 2007-11-15 23:20:48.224507577 +0100
-@@ -167,6 +167,12 @@
+diff -urN util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions util-vserver-0.30.216-r2837/scripts/vserver-build.functions
+--- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions 2009-06-22 17:36:35.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/vserver-build.functions 2009-06-22 17:48:26.000000000 +0200
+@@ -170,6 +170,12 @@
elif test -e /etc/slackware-version; then
set -- $(cat /etc/slackware-version)
DISTRIBUTION=slackware$2
elif test -n "$1"; then
DISTRIBUTION=$1
else
---- util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 20:37:09.000000000 +0200
-+++ util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 20:37:09.000000000 +0200
+diff -urN util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions.poldek util-vserver-0.30.216-r2837/scripts/vserver-build.functions.poldek
+--- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions.poldek 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/scripts/vserver-build.functions.poldek 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,81 @@
+# $Id$ --*- sh -*--
+
+# test -z "$POLDEKCONFDEFAULT" || \
+# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/
+}
---- util-vserver-0.30.214/scripts/vserver-build.poldek 2007-11-15 23:20:48.224507577 +0100
-+++ util-vserver-0.30.214/scripts/vserver-build.poldek 2008-03-25 20:25:23.000000000 +0200
+diff -urN util-vserver-0.30.216-r2837.orig/scripts/vserver-build.poldek util-vserver-0.30.216-r2837/scripts/vserver-build.poldek
+--- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/scripts/vserver-build.poldek 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,65 @@
+# $Id$ --*- sh -*--
+