+diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vpoldek util-vserver-0.30.216-pre3126/scripts/vpoldek
+--- util-vserver-0.30.216-pre3126.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-pre3126/scripts/vpoldek 2021-03-12 21:50:25.807681091 +0100
+@@ -0,0 +1,74 @@
++#! /bin/bash
++# $Id$
++
++# Copyright (C) 2007 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.
++
++: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars}
++test -e "$UTIL_VSERVER_VARS" || {
++ echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
++ exit 1
++}
++. "$UTIL_VSERVER_VARS"
++. "$_LIB_FUNCTIONS"
++
++
++function showHelp()
++{
++ echo \
++$"Usage: $0 <vserver-name>* [--all] -- <params>+
++
++Report bugs to <$PACKAGE_BUGREPORT>."
++ exit 0
++}
++
++function showVersion()
++{
++ echo \
++$"vpoldek $PACKAGE_VERSION -- poldek for vservers
++This program is part of $PACKAGE_STRING
++
++Copyright (C) 2007 Enrico Scholz
++This program is free software; you may redistribute it under the terms of
++the GNU General Public License. This program has absolutely no warranty."
++ exit 0
++}
++
++tmp=$(getopt -o +q --long help,version,debug,quiet,all -n "$0" -- "$@") || exit 1
++eval set -- "$tmp"
++
++declare -a send_through poldek_opts
++
++while true; do
++ case "$1" in
++ (--help) showHelp $0 ;;
++ (--version) showVersion ;;
++ (--debug) send_through=( "${send_through[@]}" "$1" ); set -x;;
++ (--quiet|-q) send_through=( "${send_through[@]}" "$1" );;
++ (--all) poldek_opts=( "${poldek_opts[@]}" "$1" );;
++ (--) shift; break;;
++ (*) echo $"vpoldek: internal error; arg=='$1'" >&2; exit 1;;
++ esac
++ shift
++done
++
++VSOMETHING_TITLE=vpoldek
++VSOMETHING_WORKER=$_VPOLDEK_WORKER
++VSOMETHING_PKGMGMT=1
++
++export VSOMETHING_TITLE VSOMETHING_WORKER VSOMETHING_PKGMGMT
++
++test ${#poldek_opts[@]} -eq 0 || poldek_opts=( "${poldek_opts[@]}" -- )
++exec $_VSOMETHING "${send_through[@]}" poldek "${poldek_opts[@]}" "$@"
+diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vpoldek-worker util-vserver-0.30.216-pre3126/scripts/vpoldek-worker
+--- util-vserver-0.30.216-pre3126.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-pre3126/scripts/vpoldek-worker 2021-03-12 21:50:25.807681091 +0100
+@@ -0,0 +1,45 @@
++#! /bin/bash
++# $Id$
++
++# 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.
++
++set -e
++
++: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars}
++test -e "$UTIL_VSERVER_VARS" || {
++ echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
++ exit 1
++}
++. "$UTIL_VSERVER_VARS"
++. "$_LIB_FUNCTIONS"
++
++
++vserver="$1"
++shift
++
++pkgInit "$vserver" rpm poldek
++
++test -z "$_POLDEK" || {
++ warning $"The environment variable \$_POLDEK is not supported anymore; please use \$POLDEK instead of"
++ ${POLDEK:=$_POLDEK}
++}
++
++exec ${_POLDEK:-poldek} \
++ -v --root=$VDIR \
++ --cachedir=$POLDEKCACHEDIR \
++ --conf=$POLDEK_CONFIG \
++ --pmcmd=$RPM_BINARY \
++ "$@"
+diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vserver-build util-vserver-0.30.216-pre3126/scripts/vserver-build
+--- util-vserver-0.30.216-pre3126.org/scripts/vserver-build 2016-02-24 19:09:17.000000000 +0100
++++ util-vserver-0.30.216-pre3126/scripts/vserver-build 2021-03-12 21:50:25.807681091 +0100
+@@ -60,6 +60,9 @@ Possible methods are:
+ ... installs the base-packages of the given distribution with
+ help of 'vyum'
+ urpmi ... -- -d <distribution> -m <mirror>
++ poldek ... -- -d <distribution>
++ ... installs the base-packages of the given distribution with
++ help of 'vpoldek'
+ rpm ... -- [-d <distribution>] --empty|([--force] [--nodeps] <manifest>)+
+ ... installs lists of rpm-packages
+ skeleton ... -- [<cmd> <args>*]
+@@ -142,7 +145,7 @@ setup_setDefaults "$VSERVER_NAME"
+
+ case x"$method" in
+ (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
+- (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xurpmi)
++ (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xurpmi|xpoldek)
+ . $__PKGDATADIR/vserver-build.$method
+ ;;
+ (x) panic $"No build-method specified";;
+diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vserver-build.functions util-vserver-0.30.216-pre3126/scripts/vserver-build.functions
+--- util-vserver-0.30.216-pre3126.org/scripts/vserver-build.functions 2016-02-24 19:09:17.000000000 +0100
++++ util-vserver-0.30.216-pre3126/scripts/vserver-build.functions 2021-03-12 21:50:25.807681091 +0100
+@@ -173,6 +173,12 @@ function getDistribution
+ elif test -e /etc/slackware-version; then
+ set -- $(cat /etc/slackware-version)
+ DISTRIBUTION=slackware$2
++ elif test -e /etc/pld-release; then
++ old_IFS=$IFS
++ IFS='()'
++ set -- $(cat /etc/pld-release)
++ DISTRIBUTION=pld-$(echo $2 | tr A-Z a-z)
++ IFS=$old_IFS
+ elif test -n "$1"; then
+ DISTRIBUTION=$1
+ else
+diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vserver-build.functions.poldek util-vserver-0.30.216-pre3126/scripts/vserver-build.functions.poldek
+--- util-vserver-0.30.216-pre3126.org/scripts/vserver-build.functions.poldek 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-pre3126/scripts/vserver-build.functions.poldek 2021-03-12 21:50:25.807681091 +0100
+@@ -0,0 +1,83 @@
++# $Id$ --*- sh -*--
++
++# 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.
++
++function poldek.installBasePackages
++{
++ local name="$1"
++ local dir="$2"
++
++ test "$dir" != / || return 0
++ for filelist in "$dir"/*; do
++ isRegularFile "$filelist" || continue
++ local idx=0
++ local can_fail=false
++ local flags='--install'
++
++ set -- $(<$filelist)
++ while test "$#" -gt 0; do
++ case "$1" in
++ --reinstall) flags='--reinstall';;
++ --can-fail) can_fail=true;;
++ *) break;;
++ esac
++ shift
++ done
++ "$_VPOLDEK" "$name" -- $flags $* || $can_fail
++ done
++}
++
++function poldek.initVariables
++{
++ findFile POLDEKCONFDEFAULT \
++ "$__CONFDIR/.distributions/$DISTRIBUTION/poldek/poldek.conf" \
++ "$__CONFDIR/.defaults/apps/pkgmgmt/poldek/poldek.conf" \
++ "$__DISTRIBDIR/$DISTRIBUTION/poldek/poldek.conf" \
++ "$__DISTRIBDIR/defaults/poldek/poldek.conf" \
++ ''
++}
++
++function poldek.initFilesystem
++{
++ mkdir -p "$PKGCFGDIR"/poldek/etc/repos.d
++
++ $_LN_S "$__CONFDIR"/.defaults/cachebase/poldek "$PKGCFGDIR"/poldek/cache
++
++ populateDirectory "$PKGCFGDIR/poldek/etc" \
++ "$__DISTRIBDIR/defaults/poldek" \
++ "$__DISTRIBDIR/$DISTRIBUTION/poldek" \
++ "$__CONFDIR/.distributions/$DISTRIBUTION/poldek"
++
++ populateDirectory "$PKGCFGDIR/poldek/etc/repos.d" \
++ "$__DISTRIBDIR/defaults/poldek/repos.d" \
++ "$__DISTRIBDIR/$DISTRIBUTION/poldek/repos.d" \
++ "$__CONFDIR/.distributions/$DISTRIBUTION/poldek/repos.d"
++
++ if [ -n "$SETUP_MACHINE" ]; then
++ say "Using $SETUP_MACHINE as machine"
++ sed -i -e "s#^\(_arch\s*\)=.*#\1= $SETUP_MACHINE#" "$PKGCFGDIR"/poldek/etc/repos.d/*.conf
++ fi
++
++ if [ -n "$MIRROR" ]; then
++ say "Using $MIRROR as mirror URL"
++ sed -i -e "s#^\(_prefix\s*\)=.*#\1= $MIRROR#" "$PKGCFGDIR"/poldek/etc/repos.d/*.conf
++ fi
++
++ if [ "$DISTRIBUTION" = "pld-ac" ]; then
++ echo 'auto directory dependencies = no' >> "$PKGCFGDIR"/poldek/etc/poldek.conf
++ echo '%_check_dirname_deps 0' >> "$PKGCFGDIR"/rpm/etc/macros
++ fi
++}
+diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vserver-build.poldek util-vserver-0.30.216-pre3126/scripts/vserver-build.poldek
+--- util-vserver-0.30.216-pre3126.org/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-pre3126/scripts/vserver-build.poldek 2021-03-12 21:50:25.807681091 +0100
+@@ -0,0 +1,65 @@
++# $Id$ --*- sh -*--
++
++# 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.
++
++tmp=$(getopt -o +d:,m: --long debug -n "$0" -- "$@") || exit 1
++eval set -- "$tmp"
++
++. "$_LIB_VSERVER_BUILD_FUNCTIONS_RPM"
++. "$_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK"
++. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT"
++
++while true; do
++ case "$1" in
++ (-d) DISTRIBUTION=$2; shift;;
++ (-m) MIRROR=$2; shift;;
++ (--debug) set -x;;
++ (--) shift; break ;;
++ (*) echo "vserver-build.poldek: internal error: unrecognized option '$1'" >&2
++ exit 1
++ ;;
++ esac
++ shift
++done
++
++getDistribution
++
++base.init
++
++pkgmgmt.initVariables
++rpm.initVariables
++poldek.initVariables
++
++base.initFilesystem "$OPTION_FORCE"
++pkgmgmt.initFilesystem "$OPTION_FORCE"
++rpm.initFilesystem
++poldek.initFilesystem
++
++setup_writeOption "$VSERVER_NAME"
++setup_writeInitialFstab
++
++test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
++rpm.initDB "$SETUP_CONFDIR"
++rpm.importGPGPubKeys "$SETUP_CONFDIR" \
++ "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \
++ "$__CONFDIR/.distributions/.common/pubkeys" \
++ "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
++
++$_VPOLDEK "$SETUP_CONFDIR" -- --update-whole
++poldek.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
++test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
++
++base.setSuccess