X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=util-vserver-pld.patch;h=81700f0d64d2cf7cec501c07ffd84f4f0626c835;hb=40303ba;hp=0928333f037f6c2d1bbc7248b5153e7992879729;hpb=2d225a2edc1c9c62aee44a59a80c5eaa1f52de10;p=packages%2Futil-vserver.git diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch index 0928333..81700f0 100644 --- a/util-vserver-pld.patch +++ b/util-vserver-pld.patch @@ -1,969 +1,288 @@ -diff -urN util-vserver-0.30.212.org/distrib/Makefile.am util-vserver-0.30.212/distrib/Makefile.am ---- util-vserver-0.30.212.org/distrib/Makefile.am 2006-12-09 17:15:33.000000000 +0100 -+++ util-vserver-0.30.212/distrib/Makefile.am 2007-02-04 19:00:38.703238500 +0100 -@@ -58,7 +58,9 @@ - centos4/pkgs/01 centos4/pkgs/02 centos4/pkgs/03 \ - centos4/yum/yum.conf $(wildcard centos4/yum.repos.d/*.repo) \ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/Makefile.am util-vserver-0.30.216-pre3126/distrib/Makefile.am +--- util-vserver-0.30.216-pre3126.org/distrib/Makefile.am 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/Makefile.am 2021-03-12 21:50:25.804347699 +0100 +@@ -45,6 +45,7 @@ nobase_distrib_DATA = defaults/devs \ + defaults/apt.conf \ + defaults/rpm/macros \ + defaults/apt/apt.conf \ ++ defaults/poldek/poldek.conf \ + template/initpost template/initpre \ + rh9/apt/rpmpriorities rh9/pkgs/01 rh9/pkgs/02 \ + fc1/apt/rpmpriorities fc1/pkgs/01 fc1/pkgs/02 \ +@@ -96,7 +97,9 @@ nobase_distrib_DATA = defaults/devs \ suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ -- suse91/rpm/macros -+ suse91/rpm/macros pld-ac/pkgs/01 pld-ac/rpm/macros \ -+ pld-ac/rpmlist.d/00.lst \ -+ pld-th/pkgs/01 pld-th/rpm/macros pld-th/rpmlist.d/00.lst + suse91/rpm/macros \ + gentoo/init-vserver.sh gentoo/net.vserver \ +- gentoo/reboot.sh gentoo/shutdown.sh ++ gentoo/reboot.sh gentoo/shutdown.sh\ ++ pld-ac/pkgs/01 pld-ac/rpm/macros pld-ac/rpm/macros.lang \ ++ pld-th/pkgs/01 pld-th/rpm/macros pld-th/rpm/macros.lang nobase_confdistrib_DATA = rh9/apt/sources.list \ fc1/apt/sources.list \ -@@ -67,7 +69,18 @@ - fc4/apt/sources.list \ +@@ -106,7 +109,9 @@ nobase_confdistrib_DATA = rh9/apt/sourc fc5/apt/sources.list \ fc6/apt/sources.list \ + f7/apt/sources.list \ - suse91/apt/sources.list + suse91/apt/sources.list \ -+ pld-ac/poldek/aliases.conf \ -+ pld-ac/poldek/fetch.conf \ -+ pld-ac/poldek/pld-source.conf \ -+ pld-ac/poldek/poldek.conf \ -+ pld-ac/poldek/source.conf \ -+ pld-th/poldek/aliases.conf \ -+ pld-th/poldek/fetch.conf \ -+ pld-th/poldek/pld-source.conf \ -+ pld-th/poldek/poldek.conf \ -+ pld-th/poldek/source.conf -+ ++ pld-ac/poldek/repos.d/pld.conf \ ++ pld-th/poldek/repos.d/pld.conf AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \ = $(nobase_distrib_SCRIPTS) -@@ -87,6 +100,9 @@ - ln -sf ../redhat/initpost $(DESTDIR)$(distribdir)/$$i/ && \ - ln -sf ../redhat/initpre $(DESTDIR)$(distribdir)/$$i/; \ - done -+ POLDEKARCH=$(shell rpm -E '%{_target_cpu}' 2>/dev/null); \ -+ if [ -z "$$POLDEKARCH" ] ; then POLDEKARCH=$(shell uname -m) ; fi ; \ -+ sed -i -e "s|%ARCH%|$$POLDEKARCH|g" $(DESTDIR)$(confdistribdir)/pld-*/poldek/pld-source.conf - $(mkinstalldirs) $(DESTDIR)$(confdir) \ - $(DESTDIR)$(confdistribdir)/.common/pubkeys \ - $(DESTDIR)$(confdefaultsdir) \ -diff -urN util-vserver-0.30.212.org/distrib/pld-ac/pkgs/01 util-vserver-0.30.212/distrib/pld-ac/pkgs/01 ---- util-vserver-0.30.212.org/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-ac/pkgs/01 2007-02-04 18:20:38.633243500 +0100 -@@ -0,0 +1,5 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/defaults/poldek/poldek.conf util-vserver-0.30.216-pre3126/distrib/defaults/poldek/poldek.conf +--- util-vserver-0.30.216-pre3126.org/distrib/defaults/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/defaults/poldek/poldek.conf 2021-03-12 21:50:25.804347699 +0100 +@@ -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 -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-ac/pkgs/01 util-vserver-0.30.216-pre3126/distrib/pld-ac/pkgs/01 +--- util-vserver-0.30.216-pre3126.org/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-ac/pkgs/01 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,6 @@ +basesystem -+glibc ++filesystem ++glibc-misc +issue +rpm-base +vserver-packages -diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/aliases.conf util-vserver-0.30.212/distrib/pld-ac/poldek/aliases.conf ---- util-vserver-0.30.212.org/distrib/pld-ac/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-ac/poldek/aliases.conf 2007-02-04 18:20:38.637243750 +0100 -@@ -0,0 +1,30 @@ -+# System wide aliases -+# ls -+ll = ls -l -+llu = ls -lu -+llU = ls -lU -+lli = ls -lI -+ -+# install -+freshen = install -FN -+upgrade = install -F -+ -+# for backward compatybility, greedy is on by default now -+greedy-upgrade = install -FG -+ -+just-install = install -IN -+ -+# search -+what-requires = search -r -+what-provides = search -p -+rsearch = search --perlre -+ -+exit = quit -+ -+# for fun -+#ls = uninstall kernel -+ -+less = !less -+grep = !grep -+awk = !awk -+ -diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/fetch.conf util-vserver-0.30.212/distrib/pld-ac/poldek/fetch.conf ---- util-vserver-0.30.212.org/distrib/pld-ac/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-ac/poldek/fetch.conf 2007-02-04 18:20:38.637243750 +0100 -@@ -0,0 +1,62 @@ -+# Configuration of poldek external file getters. Each [fetcher] section -+# declares one external downloader. The syntax is: -+# [fetcher] -+# name = NAME -+# proto = PROTOCOL[ ,PROTOCOL... ] -+# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO -+# Possible parameters are: -+# -+#[fetcher] -+# Unique name of the fetcher. This is an optional parameter, if not set then -+# name is taken from the "cmd" parameter value as "$(basename $cmd)". -+#name = foo -+ -+# Protocol or protocols supported by fetcher. Name of the protocol can be -+# completely arbitrary, i.e. if you can handle protocol "foo" by writing -+# a script which takes URLs in form 'foo://'. -+#proto = foo,bar -+ -+# Parameter specifies an external command and its invoking syntax. -+# The syntax of "cmd" is: -+# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n] -+# Where COMMAND is the name or full path of command, OPTION is command specific -+# options. Macro '%d' is replaced with cache directory, '%D' is replaced with -+# 'cache directory/file basename', and '%p' with file basename, %P with file full -+# path (URL). Optional suffix 'n' with %p and %P means that command can be -+# invoked with multiple files at once. -+#cmd = foogetter.sh -N %D %Pn -+ -+##Configured fetchers -+[fetcher] -+proto = cdrom -+cmd = vfjuggle %d %Pn -+ -+[fetcher] -+proto = http,ftp,https -+cmd = wget -N --dot-style=binary -P %d %Pn -+ -+[fetcher] -+proto = http,ftp -+cmd = snarf %P %D -+ -+[fetcher] -+proto = https -+cmd = curl %P -o %D -+ -+[fetcher] -+proto = rsync -+cmd = rsync -v %P %d -+ -+[fetcher] -+proto = smb -+cmd = vfsmb -v %P %d -+ -+#[fetcher] -+#proto = ssh -+#cmd = vfssh.sh %d %Pn -+ -+#[fetcher] -+#proto = foo -+#cmd = foo.sh %d %Pn -+ -+ -diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/pld-source.conf util-vserver-0.30.212/distrib/pld-ac/poldek/pld-source.conf ---- util-vserver-0.30.212.org/distrib/pld-ac/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-ac/poldek/pld-source.conf 2007-02-04 18:20:38.637243750 +0100 -@@ -0,0 +1,47 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-ac/poldek/repos.d/pld.conf util-vserver-0.30.216-pre3126/distrib/pld-ac/poldek/repos.d/pld.conf +--- util-vserver-0.30.216-pre3126.org/distrib/pld-ac/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-ac/poldek/repos.d/pld.conf 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,64 @@ +# $Id$ -+# PLD ++# PLD Linux Distribution . ++# ++# Main sources for PLD Linux 2.0 (Ac) ++ ++# specify our packages architecture ++_arch = %ARCH% ++ ++# main PLD-site for often changed things: ++_pld_main_prefix = ftp://ftp.ac.pld-linux.org/dists/ac + -+_pld_arch = %ARCH% -+_pld_prefix = ftp://ftp.ac.pld-linux.org/dists/ac +## Some mirrors +## You can use them if you have better connection there +# CI TASK: -+#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/ac -+ ++#_prefix = ftp://ftp.task.pld-linux.org/dists/ac ++_prefix = %{_pld_main_prefix} + -+_ac_idxtype = pndir -+ -+# PLD 2.0 (Ac) -+[source] -+type = %{_ac_idxtype} -+name = ac -+path = %{_pld_prefix}/PLD/%{_pld_arch}/PLD/RPMS/ ++_type = pndir + ++# PLD Linux 2.0 (Ac) +[source] -+type = %{_ac_idxtype} -+name = ac-updates-security -+path = %{_pld_prefix}/updates/security/%{_pld_arch}/ ++type = %{_type} ++name = ac-main ++path = %{_prefix}/PLD/%{_arch}/PLD/RPMS/ ++signed = yes ++pri = 1 ++# msmtp-sendmail is broken, yum noarch is older than in updates ++ignore = msmtp-sendmail* yum* + +[source] -+type = %{_ac_idxtype} -+name = ac-updates-general -+path = %{_pld_prefix}/updates/general/%{_pld_arch}/ -+noauto = yes ++type = %{_type} ++name = ac-updates ++path = %{_prefix}/updates/%{_arch}/ ++signed = yes ++pri = 1 + +[source] -+type = %{_ac_idxtype} -+name = ac-supported -+path = %{_pld_prefix}/supported/%{_pld_arch}/ -+noauto = yes -+ -+[source] -+type = %{_ac_idxtype} -+name = ac-ready -+path = %{_pld_prefix}/ready/%{_pld_arch}/ -+noauto = yes ++type = %{_type} ++name = ac-supported ++path = %{_prefix}/supported/%{_arch}/ ++signed = yes ++auto = no ++autoup = no + +[source] -+type = %{_ac_idxtype} -+name = ac-test -+path = %{_pld_prefix}/test/%{_pld_arch}/ -+noauto = yes -diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/poldek.conf util-vserver-0.30.212/distrib/pld-ac/poldek/poldek.conf ---- util-vserver-0.30.212.org/distrib/pld-ac/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-ac/poldek/poldek.conf 2007-02-04 18:20:38.637243750 +0100 -@@ -0,0 +1,182 @@ -+# poldek main configuration file. -+ -+# Some macros. Macros are local, they are not visible in included files -+# and macros declared in them are not visible to includer. -+# Macros names starts with underscore '_'. -+# -+_distro = pld -+ -+# Both local and remote files may be included. Included files may not contain -+# [global] section, it will be ignored anyway. -+%include %{_distro}-source.conf -+ -+# local sources -+%include source.conf -+ -+# External downloaders configuration, not necessary in most cases, cause -+# to internal HTTP and FTP client. -+#%include fetch.conf -+ -+[global] -+ -+ -+# This parameter allows to configure the default repository index type. -+#default index type = pndir -+ -+# Cache directory for downloaded files. NOTE: that parent directory of cachedir -+# must exists. -+#cachedir = $HOME/.poldek-cache -+ -+# Switch to ordinary user at startup when executed by root -+#runas = poldek -+ -+# Permits using root privileges for installation only. Automatically turned -+# on when poldek executed as ordinary user. -+#use sudo = no -+ -+# Load /etc/apt/sources.list. -+#load apt sources list = no -+ -+# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2). -+# This option is a workaround for broken zlib linked into librpm; with enabled -+# 'auto zlib in rpm' poldek tries to detect such case and then enables external -+# *.gz handling automatically. -+#vfile external compress = no -+ -+# Auto detection of zlib linked into librpm. See 'vfile external compress' -+# description. -+#auto zlib in rpm = yes -+ -+# Automatically download whole index if incremental update fails. -+#autoupa = yes -+ -+# Do not save given paths into created indexes. This option may significantly -+# reduce index size. Example (notice missing starting '/'): -+# exclude path = usr/share/doc:usr/share/man:usr/src -+#exclude path = -+ -+# Full path name to a PM (rpm for now) binary. -+#pm command = /bin/rpm -+ -+# Full path name to sudo binary. -+#sudo command = /usr/bin/sudo -+ -+ -+### File downloaders configuration -+ -+# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default -+# 'poldek@znienacka.net' is sent) -+#vfile ftp sysuser as anon passwd = no -+ -+# File getters configuration parameter. By this option URL handlers may be configured. -+# To get file from HTTP and FTP servers poldek uses its internal client (what is -+# recommended), although it can be changedby this option. Others protocols handled -+# by external utilities can be configured also. The syntax is: -+# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME -+ -+# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch] -+# sections (placed in fetch.conf in default configuration). -+# Examples: -+# default fetcher = ftp,http:internal -+# default fetcher = https:wget -+# default fetcher = cdrom:vfjuggle -+# vfjuggle is a cdrom getter supplied with poldek. -+#default fetcher = http,ftp: internal -+ -+# Proxies for internal FTP and HTTP client may be configured in usual -+# way, by environment variables ftp_proxy and http_proxy, or by this option. -+# Its syntax is similar to "default fetcher" one: -+# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL -+# Example: -+# proxy = http: http://w3cache.foo.org:8080 -+#proxy = -+ -+# Comma separated list of hosts or domains which will not be accessed via proxy. -+# Option overrides no_proxy environment variable. -+# Example: -+# noproxy = localhost, .pl, ftp.foo.bar.org -+#noproxy = -+ -+# Internal HTTP and FTP client is stubborn, it retries to retrive -+# file if connection breaks. This option tells it how many times -+# it should try. -+#vfile retries = 128 -+ -+ -+### Installation options -+ -+# Install packages in small groups instead of doing all-or-nothing -+# installations. -+particle install = no -+ -+# Do not remove downloaded packages after its successful installation. -+#keep downloads = no -+ -+# Controls visibility of multiple package instances with different EVR. -+# If on, only one, highest version will be visible. -+#unique package names = no -+ -+# Epoch autopromotion during dependency comparision. RPM specific. -+# Set it up if you are using system with rpm prior to 4.2.1 version. -+#promoteepoch = no -+ -+# Confirm packages installation. -+#confirm installation = no -+ -+# Confirm packages removal. -+#confirm removal = yes -+ -+# Let the user select package among equivalents. -+choose equivalents manually = yes -+ -+# Prevent package listed from being upgraded if they are already installed. -+# hold = kernel* dev -+#hold = -+ -+# Ignore package list - packages fits given mask will be invisible. -+# ignore = *-smp-* foo* -+ignore = kernel* udev devfs -+ -+# Conflicts with already installed packages are treated as resolved -+# if at least one of multiple-installed package satisfies conflict. -+# rpm doesn't support such cases, so --pm-nodeps is needed (use with -+# care). -+#allow duplicates = yes -+ -+ -+### RPM specific options -+ -+# rpm macros can be set by this option. Examples: -+# rpmdef = _install_langs pl:pl_PL:lt:lt_LT -+# Do not install any documentation: -+# rpmdef = _netsharedpath /usr/share/info:/usr/share/man -+# rpmdef = _excludedocs 1 -+#rpmdef = -+ -+ -+### Dependency processing settings -+# Subtle dependency processing options, they should not be changed -+# unless you know what you are doing -+ -+# Automatically install packages required by installed ones. -+#follow = yes -+ -+# Greedy upgrades, i.e. upgrade packages which dependencies are broken -+# by being uninstalled ones. -+#greedy = yes -+ -+# Be yet more greedy; if successor of orphaned package found, and this -+# successor drags no packages then upgrade the package instead of process -+# its dependencies. Option value is implied by 'greedy' one by defalut. -+#aggressive greedy = yes -+ -+# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g. -+# package A requires capability foo >= 1.0 while package B provides "foo" -+# without any version. Use with care, it may cause weird dependency errors. -+#mercy = no -+ -+# Taking into account package Obsoletes. -+#obsoletes = yes -+ -+# Taking into account package Conflicts. -+#conflicts = yes -diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/source.conf util-vserver-0.30.212/distrib/pld-ac/poldek/source.conf ---- util-vserver-0.30.212.org/distrib/pld-ac/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-ac/poldek/source.conf 2007-02-04 18:20:38.637243750 +0100 -@@ -0,0 +1,85 @@ -+# Sample poldek sources configuration -+# Every source is configured in his own [source] section. -+# Possible parameters are: -+# -+#[source] -+# Unique name of the repository. -+#name = foo -+ -+# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum' -+# and 'dir' as listed by --stl switch. -+#type = pndir -+ -+# This parameter sets index original type i.e type of repository -+# from what this repository is created. Default is 'dir' - means -+# that directory of packages is scanned. -+#original type = dir -+ -+# Unique name of the repository. May be either path or URL. -+#path = /some/url/or/dir -+ -+# If package index and packages are stored in different locations then -+# prefix stands for packages path. -+#prefix = /some/url/or/dir -+ -+# Controls visibility of multiple package instances with different EVR. -+# If on, only one, highest version will be visible. -+#douniq = no -+ -+# Repository priority. If the same packages (equal names and EVR) -+# are available in more than one source then package from highest -+# prioritized source are taken. Priority is numeric value. Lower number -+# means higher priority, and negative priorities are allowed. -+# Priority is numeric value. -+#pri = 0 -+ -+# Controling if repository index will be implicit loaded. Set it off if -+# the index should be loaded on demand only, i.e. if specified directly -+# by --sn option. -+#auto = yes -+ -+# Controls if repository index will be implicit updated. Set it off if -+# the index should be updated on demand only, i.e. if specified directly -+# by --sn option. -+#autoup = yes -+ -+# Packages PGP/GPG signatures (if any) will be verified before their -+# installation. -+#signed = no -+ -+# Have the same meaning as [global] parameter. Example: -+# hold = kernel* dev -+#hold = -+ -+# Have the same meaning as [global] parameter. Example: -+# ignore = kernel*smp* dev -+#ignore = -+ -+# Parameter have the same meaning as [global] parameter. -+# exclude path = usr/share/doc:usr/share/man:usr/src -+#exclude path = -+ -+# Preferred language of package descriptions. If not set, taken from locale -+# settings. Example: -+# lang = pl_PL:lt_LT -+#lang = ++type = %{_type} ++name = ac-ready ++path = %{_pld_main_prefix}/ready/%{_arch}/ ++#signed = yes ++auto = no ++autoup = no + +[source] -+name = home -+type = dir -+path = $HOME/rpm/RPMS -+auto = no ++type = %{_type} ++name = ac-test ++path = %{_pld_main_prefix}/test/%{_arch}/ ++auto = no +autoup = no + -+#[source] -+#type = pndir -+#name = foo -+#path = ftp://ftp.foo.bar.org/RPMS/ -+#pri = -10 -+#auto = no -+#autoup = no -+#signed = yes -+#hold = kernel* -+#ignore = kernel*-smp-* -+#dscr = pl_PL -+ -diff -urN util-vserver-0.30.212.org/distrib/pld-ac/rpm/macros util-vserver-0.30.212/distrib/pld-ac/rpm/macros ---- util-vserver-0.30.212.org/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-ac/rpm/macros 2007-02-04 18:20:38.637243750 +0100 -@@ -0,0 +1,4 @@ ++# ac-main + ac-updates ++[source] ++type = group ++name = ac ++sources = ac-main ac-updates +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-ac/rpm/macros util-vserver-0.30.216-pre3126/distrib/pld-ac/rpm/macros +--- util-vserver-0.30.216-pre3126.org/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-ac/rpm/macros 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,3 @@ ++%_netsharedpath /dev:/proc ++%_tmppath /tmp ++%_host_os %_os +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-ac/rpm/macros.lang util-vserver-0.30.216-pre3126/distrib/pld-ac/rpm/macros.lang +--- util-vserver-0.30.216-pre3126.org/distrib/pld-ac/rpm/macros.lang 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-ac/rpm/macros.lang 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,3 @@ +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725 +# you have to use at least one language beside 'C' +%_install_langs C:en:pl -+%_netsharedpath /dev -diff -urN util-vserver-0.30.212.org/distrib/pld-ac/rpmlist.d/00.lst util-vserver-0.30.212/distrib/pld-ac/rpmlist.d/00.lst ---- util-vserver-0.30.212.org/distrib/pld-ac/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-ac/rpmlist.d/00.lst 2007-02-04 18:20:38.637243750 +0100 -@@ -0,0 +1,10 @@ -+basesystem-*.rpm -+dev-*.rpm -+FHS-*.rpm -+glibc-misc-*.rpm -+glibc-[0-9]*.rpm -+libgcc-[0-9]*.rpm -+setup-*.rpm -+issue-[0-9]*.rpm -+rpm-base-*.rpm -+vserver-packages-*.rpm -diff -urN util-vserver-0.30.212.org/distrib/pld-th/pkgs/01 util-vserver-0.30.212/distrib/pld-th/pkgs/01 ---- util-vserver-0.30.212.org/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-th/pkgs/01 2007-02-04 18:20:38.633243000 +0100 -@@ -0,0 +1,5 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-th/pkgs/01 util-vserver-0.30.216-pre3126/distrib/pld-th/pkgs/01 +--- util-vserver-0.30.216-pre3126.org/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-th/pkgs/01 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,6 @@ +basesystem ++filesystem +glibc +issue +rpm-base +vserver-packages -diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/aliases.conf util-vserver-0.30.212/distrib/pld-th/poldek/aliases.conf ---- util-vserver-0.30.212.org/distrib/pld-th/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-th/poldek/aliases.conf 2007-02-04 18:20:38.637243000 +0100 -@@ -0,0 +1,30 @@ -+# System wide aliases -+# ls -+ll = ls -l -+llu = ls -lu -+llU = ls -lU -+lli = ls -lI -+ -+# install -+freshen = install -FN -+upgrade = install -F -+ -+# for backward compatybility, greedy is on by default now -+greedy-upgrade = install -FG -+ -+just-install = install -IN -+ -+# search -+what-requires = search -r -+what-provides = search -p -+rsearch = search --perlre -+ -+exit = quit -+ -+# for fun -+#ls = uninstall kernel -+ -+less = !less -+grep = !grep -+awk = !awk -+ -diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/fetch.conf util-vserver-0.30.212/distrib/pld-th/poldek/fetch.conf ---- util-vserver-0.30.212.org/distrib/pld-th/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-th/poldek/fetch.conf 2007-02-04 18:20:38.637243000 +0100 -@@ -0,0 +1,62 @@ -+# Configuration of poldek external file getters. Each [fetcher] section -+# declares one external downloader. The syntax is: -+# [fetcher] -+# name = NAME -+# proto = PROTOCOL[ ,PROTOCOL... ] -+# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO -+# Possible parameters are: +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-th/poldek/repos.d/pld.conf util-vserver-0.30.216-pre3126/distrib/pld-th/poldek/repos.d/pld.conf +--- util-vserver-0.30.216-pre3126.org/distrib/pld-th/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-th/poldek/repos.d/pld.conf 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,71 @@ ++# PLD Linux Distribution . +# -+#[fetcher] -+# Unique name of the fetcher. This is an optional parameter, if not set then -+# name is taken from the "cmd" parameter value as "$(basename $cmd)". -+#name = foo -+ -+# Protocol or protocols supported by fetcher. Name of the protocol can be -+# completely arbitrary, i.e. if you can handle protocol "foo" by writing -+# a script which takes URLs in form 'foo://'. -+#proto = foo,bar -+ -+# Parameter specifies an external command and its invoking syntax. -+# The syntax of "cmd" is: -+# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n] -+# Where COMMAND is the name or full path of command, OPTION is command specific -+# options. Macro '%d' is replaced with cache directory, '%D' is replaced with -+# 'cache directory/file basename', and '%p' with file basename, %P with file full -+# path (URL). Optional suffix 'n' with %p and %P means that command can be -+# invoked with multiple files at once. -+#cmd = foogetter.sh -N %D %Pn -+ -+##Configured fetchers -+[fetcher] -+proto = cdrom -+cmd = vfjuggle %d %Pn -+ -+[fetcher] -+proto = http,ftp,https -+cmd = wget -N --dot-style=binary -P %d %Pn -+ -+[fetcher] -+proto = http,ftp -+cmd = snarf %P %D -+ -+[fetcher] -+proto = https -+cmd = curl %P -o %D -+ -+[fetcher] -+proto = rsync -+cmd = rsync -v %P %d -+ -+[fetcher] -+proto = smb -+cmd = vfsmb -v %P %d -+ -+#[fetcher] -+#proto = ssh -+#cmd = vfssh.sh %d %Pn -+ -+#[fetcher] -+#proto = foo -+#cmd = foo.sh %d %Pn -+ -+ -diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/pld-source.conf util-vserver-0.30.212/distrib/pld-th/poldek/pld-source.conf ---- util-vserver-0.30.212.org/distrib/pld-th/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-th/poldek/pld-source.conf 2007-02-04 18:25:33.175651250 +0100 -@@ -0,0 +1,51 @@ -+# PLD -+ -+_pld_arch = %ARCH% -+_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th ++# Main sources for PLD Linux 3.0 (Th) ++ ++# specify our packages architecture ++_arch = %ARCH% ++ ++# main PLD-site for often changed things (test, ready): ++_pld_main_prefix = ftp://ftp.th.pld-linux.org/dists/th ++ +## Some mirrors +## You can use them if you have better connection there +# CI TASK: -+#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/th -+ -+ -+_th_idxtype = pndir ++#_prefix = ftp://ftp.task.pld-linux.org/dists/th ++_prefix = %{_pld_main_prefix} + -+# PLD 3.0 (Th) ++# PLD Linux 3.0 (Th): main sources +[source] -+type = %{_th_idxtype} -+name = th -+path = %{_pld_prefix}/PLD/%{_pld_arch}/RPMS/ ++type = pndir ++name = th ++path = %{_prefix}/PLD/%{_arch}/RPMS/ + +[source] -+type = %{_th_idxtype} -+name = th -+path = %{_pld_prefix}/PLD/noarch/RPMS/ ++type = pndir ++name = th ++path = %{_prefix}/PLD/noarch/RPMS/ + ++# PLD Linux 3.0 (Th): obsolete sources (kde3, ...) +[source] -+type = %{_th_idxtype} -+name = th-updates-security -+path = %{_pld_prefix}/updates-security/%{_pld_arch}/RPMS/ ++type = pndir ++name = th-obsolete ++path = %{_prefix}/obsolete/%{_arch}/RPMS/ ++auto = no ++autoup = no + +[source] -+type = %{_th_idxtype} -+name = th-updates-general -+path = %{_pld_prefix}/updates-general/%{_pld_arch}/RPMS/ -+noauto = yes -+ -+#[source] -+#type = %{_th_idxtype} -+#name = th-supported -+#path = %{_pld_prefix}/supported/%{_pld_arch}/RPMS/ -+#noauto = yes ++type = pndir ++name = th-obsolete ++path = %{_prefix}/obsolete/noarch/RPMS/ ++auto = no ++autoup = no + ++# PLD Linux 3.0 (Th): ready sources (testing stage before moved to main) +[source] -+type = %{_th_idxtype} -+name = th-ready -+path = %{_pld_prefix}/ready/%{_pld_arch}/RPMS/ -+noauto = yes ++type = pndir ++name = th-ready ++path = %{_pld_main_prefix}/ready/%{_arch}/RPMS/ ++auto = no ++autoup = no + +[source] -+type = %{_th_idxtype} -+name = th-test -+path = %{_pld_prefix}/test/%{_pld_arch}/RPMS/ -+noauto = yes -diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/poldek.conf util-vserver-0.30.212/distrib/pld-th/poldek/poldek.conf ---- util-vserver-0.30.212.org/distrib/pld-th/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-th/poldek/poldek.conf 2007-02-04 18:20:38.637243000 +0100 -@@ -0,0 +1,182 @@ -+# poldek main configuration file. -+ -+# Some macros. Macros are local, they are not visible in included files -+# and macros declared in them are not visible to includer. -+# Macros names starts with underscore '_'. -+# -+_distro = pld -+ -+# Both local and remote files may be included. Included files may not contain -+# [global] section, it will be ignored anyway. -+%include %{_distro}-source.conf -+ -+# local sources -+%include source.conf -+ -+# External downloaders configuration, not necessary in most cases, cause -+# to internal HTTP and FTP client. -+#%include fetch.conf -+ -+[global] -+ -+ -+# This parameter allows to configure the default repository index type. -+#default index type = pndir -+ -+# Cache directory for downloaded files. NOTE: that parent directory of cachedir -+# must exists. -+#cachedir = $HOME/.poldek-cache -+ -+# Switch to ordinary user at startup when executed by root -+#runas = poldek -+ -+# Permits using root privileges for installation only. Automatically turned -+# on when poldek executed as ordinary user. -+#use sudo = no -+ -+# Load /etc/apt/sources.list. -+#load apt sources list = no -+ -+# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2). -+# This option is a workaround for broken zlib linked into librpm; with enabled -+# 'auto zlib in rpm' poldek tries to detect such case and then enables external -+# *.gz handling automatically. -+#vfile external compress = no -+ -+# Auto detection of zlib linked into librpm. See 'vfile external compress' -+# description. -+#auto zlib in rpm = yes -+ -+# Automatically download whole index if incremental update fails. -+#autoupa = yes -+ -+# Do not save given paths into created indexes. This option may significantly -+# reduce index size. Example (notice missing starting '/'): -+# exclude path = usr/share/doc:usr/share/man:usr/src -+#exclude path = -+ -+# Full path name to a PM (rpm for now) binary. -+#pm command = /bin/rpm -+ -+# Full path name to sudo binary. -+#sudo command = /usr/bin/sudo -+ -+ -+### File downloaders configuration -+ -+# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default -+# 'poldek@znienacka.net' is sent) -+#vfile ftp sysuser as anon passwd = no -+ -+# File getters configuration parameter. By this option URL handlers may be configured. -+# To get file from HTTP and FTP servers poldek uses its internal client (what is -+# recommended), although it can be changedby this option. Others protocols handled -+# by external utilities can be configured also. The syntax is: -+# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME -+ -+# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch] -+# sections (placed in fetch.conf in default configuration). -+# Examples: -+# default fetcher = ftp,http:internal -+# default fetcher = https:wget -+# default fetcher = cdrom:vfjuggle -+# vfjuggle is a cdrom getter supplied with poldek. -+#default fetcher = http,ftp: internal -+ -+# Proxies for internal FTP and HTTP client may be configured in usual -+# way, by environment variables ftp_proxy and http_proxy, or by this option. -+# Its syntax is similar to "default fetcher" one: -+# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL -+# Example: -+# proxy = http: http://w3cache.foo.org:8080 -+#proxy = -+ -+# Comma separated list of hosts or domains which will not be accessed via proxy. -+# Option overrides no_proxy environment variable. -+# Example: -+# noproxy = localhost, .pl, ftp.foo.bar.org -+#noproxy = -+ -+# Internal HTTP and FTP client is stubborn, it retries to retrive -+# file if connection breaks. This option tells it how many times -+# it should try. -+#vfile retries = 128 -+ -+ -+### Installation options -+ -+# Install packages in small groups instead of doing all-or-nothing -+# installations. -+particle install = no -+ -+# Do not remove downloaded packages after its successful installation. -+#keep downloads = no -+ -+# Controls visibility of multiple package instances with different EVR. -+# If on, only one, highest version will be visible. -+#unique package names = no -+ -+# Epoch autopromotion during dependency comparision. RPM specific. -+# Set it up if you are using system with rpm prior to 4.2.1 version. -+#promoteepoch = no -+ -+# Confirm packages installation. -+#confirm installation = no -+ -+# Confirm packages removal. -+#confirm removal = yes -+ -+# Let the user select package among equivalents. -+choose equivalents manually = yes -+ -+# Prevent package listed from being upgraded if they are already installed. -+# hold = kernel* dev -+#hold = -+ -+# Ignore package list - packages fits given mask will be invisible. -+# ignore = *-smp-* foo* -+ignore = kernel* udev devfs -+ -+# Conflicts with already installed packages are treated as resolved -+# if at least one of multiple-installed package satisfies conflict. -+# rpm doesn't support such cases, so --pm-nodeps is needed (use with -+# care). -+#allow duplicates = yes -+ -+ -+### RPM specific options -+ -+# rpm macros can be set by this option. Examples: -+# rpmdef = _install_langs pl:pl_PL:lt:lt_LT -+# Do not install any documentation: -+# rpmdef = _netsharedpath /usr/share/info:/usr/share/man -+# rpmdef = _excludedocs 1 -+#rpmdef = -+ -+ -+### Dependency processing settings -+# Subtle dependency processing options, they should not be changed -+# unless you know what you are doing -+ -+# Automatically install packages required by installed ones. -+#follow = yes -+ -+# Greedy upgrades, i.e. upgrade packages which dependencies are broken -+# by being uninstalled ones. -+#greedy = yes -+ -+# Be yet more greedy; if successor of orphaned package found, and this -+# successor drags no packages then upgrade the package instead of process -+# its dependencies. Option value is implied by 'greedy' one by defalut. -+#aggressive greedy = yes -+ -+# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g. -+# package A requires capability foo >= 1.0 while package B provides "foo" -+# without any version. Use with care, it may cause weird dependency errors. -+#mercy = no -+ -+# Taking into account package Obsoletes. -+#obsoletes = yes -+ -+# Taking into account package Conflicts. -+#conflicts = yes -diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/source.conf util-vserver-0.30.212/distrib/pld-th/poldek/source.conf ---- util-vserver-0.30.212.org/distrib/pld-th/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-th/poldek/source.conf 2007-02-04 18:20:38.637243000 +0100 -@@ -0,0 +1,85 @@ -+# Sample poldek sources configuration -+# Every source is configured in his own [source] section. -+# Possible parameters are: -+# -+#[source] -+# Unique name of the repository. -+#name = foo -+ -+# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum' -+# and 'dir' as listed by --stl switch. -+#type = pndir -+ -+# This parameter sets index original type i.e type of repository -+# from what this repository is created. Default is 'dir' - means -+# that directory of packages is scanned. -+#original type = dir -+ -+# Unique name of the repository. May be either path or URL. -+#path = /some/url/or/dir -+ -+# If package index and packages are stored in different locations then -+# prefix stands for packages path. -+#prefix = /some/url/or/dir -+ -+# Controls visibility of multiple package instances with different EVR. -+# If on, only one, highest version will be visible. -+#douniq = no -+ -+# Repository priority. If the same packages (equal names and EVR) -+# are available in more than one source then package from highest -+# prioritized source are taken. Priority is numeric value. Lower number -+# means higher priority, and negative priorities are allowed. -+# Priority is numeric value. -+#pri = 0 -+ -+# Controling if repository index will be implicit loaded. Set it off if -+# the index should be loaded on demand only, i.e. if specified directly -+# by --sn option. -+#auto = yes -+ -+# Controls if repository index will be implicit updated. Set it off if -+# the index should be updated on demand only, i.e. if specified directly -+# by --sn option. -+#autoup = yes -+ -+# Packages PGP/GPG signatures (if any) will be verified before their -+# installation. -+#signed = no -+ -+# Have the same meaning as [global] parameter. Example: -+# hold = kernel* dev -+#hold = -+ -+# Have the same meaning as [global] parameter. Example: -+# ignore = kernel*smp* dev -+#ignore = -+ -+# Parameter have the same meaning as [global] parameter. -+# exclude path = usr/share/doc:usr/share/man:usr/src -+#exclude path = -+ -+# Preferred language of package descriptions. If not set, taken from locale -+# settings. Example: -+# lang = pl_PL:lt_LT -+#lang = ++type = pndir ++name = th-ready ++path = %{_pld_main_prefix}/ready/noarch/RPMS/ ++auto = no ++autoup = no + ++# PLD Linux 3.0 (Th): test sources (built packages to be moved to ready) +[source] -+name = home -+type = dir -+path = $HOME/rpm/RPMS -+auto = no ++type = pndir ++name = th-test ++path = %{_pld_main_prefix}/test/%{_arch}/RPMS/ ++auto = no +autoup = no + -+#[source] -+#type = pndir -+#name = foo -+#path = ftp://ftp.foo.bar.org/RPMS/ -+#pri = -10 -+#auto = no -+#autoup = no -+#signed = yes -+#hold = kernel* -+#ignore = kernel*-smp-* -+#dscr = pl_PL -+ -diff -urN util-vserver-0.30.212.org/distrib/pld-th/rpm/macros util-vserver-0.30.212/distrib/pld-th/rpm/macros ---- util-vserver-0.30.212.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-th/rpm/macros 2007-02-04 18:20:38.637243000 +0100 -@@ -0,0 +1,4 @@ ++[source] ++type = pndir ++name = th-test ++path = %{_pld_main_prefix}/test/noarch/RPMS/ ++auto = no ++autoup = no +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-th/rpm/macros util-vserver-0.30.216-pre3126/distrib/pld-th/rpm/macros +--- util-vserver-0.30.216-pre3126.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-th/rpm/macros 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,3 @@ ++%_netsharedpath /dev:/proc ++%_tmppath /tmp ++%_host_os %_os +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-th/rpm/macros.lang util-vserver-0.30.216-pre3126/distrib/pld-th/rpm/macros.lang +--- util-vserver-0.30.216-pre3126.org/distrib/pld-th/rpm/macros.lang 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-th/rpm/macros.lang 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,3 @@ +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725 +# you have to use at least one language beside 'C' +%_install_langs C:en:pl -+%_netsharedpath /dev -diff -urN util-vserver-0.30.212.org/distrib/pld-th/rpmlist.d/00.lst util-vserver-0.30.212/distrib/pld-th/rpmlist.d/00.lst ---- util-vserver-0.30.212.org/distrib/pld-th/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/distrib/pld-th/rpmlist.d/00.lst 2007-02-04 18:20:38.637243000 +0100 -@@ -0,0 +1,10 @@ -+basesystem-*.rpm -+dev-*.rpm -+FHS-*.rpm -+glibc-misc-*.rpm -+glibc-[0-9]*.rpm -+libgcc-[0-9]*.rpm -+setup-*.rpm -+issue-[0-9]*.rpm -+rpm-base-*.rpm -+vserver-packages-*.rpm -diff -urN util-vserver-0.30.212.org/scripts/functions util-vserver-0.30.212/scripts/functions ---- util-vserver-0.30.212.org/scripts/functions 2006-12-09 17:15:24.000000000 +0100 -+++ util-vserver-0.30.212/scripts/functions 2007-02-04 18:20:38.637243750 +0100 -@@ -394,6 +394,20 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/Makefile-files util-vserver-0.30.216-pre3126/scripts/Makefile-files +--- util-vserver-0.30.216-pre3126.org/scripts/Makefile-files 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/Makefile-files 2021-03-12 21:50:25.804347699 +0100 +@@ -21,6 +21,7 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \ + scripts/vapt-get-worker \ + scripts/vrpm-worker \ + scripts/vyum-worker \ ++ scripts/vpoldek-worker \ + scripts/vrpm-preload \ + scripts/vurpm-worker \ + scripts/save_s_context \ +@@ -50,12 +51,14 @@ scripts_pkglib_src_DTA = scripts/functio + scripts/vserver-build.template \ + scripts/vserver-build.rsync \ + scripts/vserver-build.clone \ ++ scripts/vserver-build.poldek \ + scripts/vserver-build.functions \ + scripts/vserver-build.functions.apt \ + scripts/vserver-build.functions.pkgmgmt \ + scripts/vserver-build.functions.rpm \ + scripts/vserver-build.functions.urpmi \ + scripts/vserver-build.functions.yum \ ++ scripts/vserver-build.functions.poldek \ + scripts/vserver-setup.functions \ + scripts/vserver.functions \ + scripts/vserver.start \ +@@ -71,6 +74,7 @@ scripts_pkglib_gen_SCRPTS = scripts/vshe + scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \ + scripts/vapt-get-worker \ + scripts/vpkg \ ++ scripts/vpoldek-worker \ + scripts/vrpm-worker \ + scripts/vrpm-preload \ + scripts/start-vservers \ +@@ -94,6 +98,7 @@ scripts_legacy_src_PRGS = scripts/legacy + scripts_sbin_src_PRGS = scripts/chbind \ + scripts/chcontext \ + scripts/vapt-get \ ++ scripts/vpoldek \ + scripts/vdispatch-conf \ + scripts/vemerge \ + scripts/vesync \ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/functions util-vserver-0.30.216-pre3126/scripts/functions +--- util-vserver-0.30.216-pre3126.org/scripts/functions 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/functions 2021-03-12 21:50:25.804347699 +0100 +@@ -411,6 +411,20 @@ function _pkgSetVarsUrpmi fi } @@ -984,15 +303,15 @@ diff -urN util-vserver-0.30.212.org/scripts/functions util-vserver-0.30.212/scri function _pkgMountBase { -@@ -467,6 +481,7 @@ - rpm) _pkgSetVarsRPM;; +@@ -495,6 +509,7 @@ function pkgInit apt) _pkgSetVarsApt;; yum) _pkgSetVarsYum;; + urpmi) _pkgSetVarsUrpmi;; + poldek) _pkgSetVarsPoldek;; *) echo "Unknown packaging flavor" >&2; exit 1;; esac done -@@ -750,6 +765,8 @@ +@@ -869,6 +884,8 @@ function pkgmgmt.guessStyle() style=redhat elif test -e "$_pgs_vdir"/etc/mandrake-release; then style=mandrake @@ -1001,8 +320,8 @@ diff -urN util-vserver-0.30.212.org/scripts/functions util-vserver-0.30.212/scri elif test -e "$_pgs_vdir"/etc/debian_version; then style=debian elif test -e "$_pgs_vdir"/etc/SuSE-release; then -@@ -817,6 +834,27 @@ - test -n "$have_yum" && return 0 || return 1 +@@ -957,6 +974,27 @@ function pkgmgmt.isUrpmiAvailable + test -n "$have_urpmi" && return 0 || return 1 } +## Usage: pkgmgmt.isPoldekAvailable [] @@ -1029,72 +348,31 @@ diff -urN util-vserver-0.30.212.org/scripts/functions util-vserver-0.30.212/scri function vshelper.doSanityCheck { -diff -urN util-vserver-0.30.212.org/scripts/Makefile-files util-vserver-0.30.212/scripts/Makefile-files ---- util-vserver-0.30.212.org/scripts/Makefile-files 2006-12-09 17:15:24.000000000 +0100 -+++ util-vserver-0.30.212/scripts/Makefile-files 2007-02-04 18:20:38.669245750 +0100 -@@ -21,6 +21,7 @@ - scripts/vapt-get-worker \ - scripts/vrpm-worker \ - scripts/vyum-worker \ -+ scripts/vpoldek-worker \ - scripts/vrpm-preload \ - scripts/save_s_context \ - scripts/vservers.grabinfo.sh \ -@@ -47,11 +48,13 @@ - scripts/vserver-build.yum \ - scripts/vserver-build.template \ - scripts/vserver-build.rsync \ -+ scripts/vserver-build.poldek \ - scripts/vserver-build.functions \ - scripts/vserver-build.functions.apt \ - scripts/vserver-build.functions.rpm \ - scripts/vserver-build.functions.pkgmgmt \ - scripts/vserver-build.functions.yum \ -+ scripts/vserver-build.functions.poldek \ - scripts/vserver-setup.functions \ - scripts/vserver.functions \ - scripts/vserver.start \ -@@ -64,6 +67,7 @@ - scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \ - scripts/vapt-get-worker \ - scripts/vpkg \ -+ scripts/vpoldek-worker \ - scripts/vrpm-worker \ - scripts/vrpm-preload \ - scripts/start-vservers \ -@@ -86,6 +90,7 @@ - scripts_sbin_src_PRGS = scripts/chbind \ - scripts/chcontext \ - scripts/vapt-get \ -+ scripts/vpoldek \ - scripts/vdispatch-conf \ - scripts/vemerge \ - scripts/vesync \ -diff -urN util-vserver-0.30.212.org/scripts/pkgmgmt util-vserver-0.30.212/scripts/pkgmgmt ---- util-vserver-0.30.212.org/scripts/pkgmgmt 2006-12-09 17:15:24.000000000 +0100 -+++ util-vserver-0.30.212/scripts/pkgmgmt 2007-02-04 18:20:38.673246000 +0100 -@@ -195,7 +195,7 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/pkgmgmt util-vserver-0.30.216-pre3126/scripts/pkgmgmt +--- util-vserver-0.30.216-pre3126.org/scripts/pkgmgmt 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/pkgmgmt 2021-03-12 21:50:25.804347699 +0100 +@@ -195,7 +195,7 @@ packagemanagement: " case $2 in -- (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}") -+ (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}") +- (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum urpmi "${YUM_RELEASEPKGS[@]}") ++ (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum urpmi poldek "${YUM_RELEASEPKGS[@]}") hasSubstring "$pkgs" ---rpm--- || { warning "$ERR * The vserver does not seem to have the 'rpm' package which is required -@@ -205,9 +205,9 @@ +@@ -205,9 +205,9 @@ packagemanagement: ERR= } -- hasSubstring "$pkgs" ---apt--- ---yum--- || { -+ hasSubstring "$pkgs" ---apt--- ---yum--- ---poldek--- || { +- hasSubstring "$pkgs" ---apt--- ---yum--- ---urpmi--- || { ++ hasSubstring "$pkgs" ---apt--- ---yum--- ---urpmi--- ---poldek--- || { warning "$ERR -* The vserver does not seem to have a depsolver like 'apt' or 'yum' +* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek' installed. It is suggested to install such a program before setting up internal package management." res=1 -@@ -368,6 +368,131 @@ +@@ -381,6 +381,131 @@ Can not continue; use '--force' to overr fi } @@ -1226,7 +504,7 @@ diff -urN util-vserver-0.30.212.org/scripts/pkgmgmt util-vserver-0.30.212/script function processVserver_Debian() { local vserver=$1 -@@ -417,6 +542,7 @@ +@@ -435,6 +560,7 @@ function processVserver() case "$style" in (redhat|mandrake) processVserver_RH "$vserver" "$IS_INTERNALIZE";; @@ -1234,30 +512,30 @@ diff -urN util-vserver-0.30.212.org/scripts/pkgmgmt util-vserver-0.30.212/script (debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";; (*) echo $"Vserver style '$style' is not supported for packagemanagment" >&2 -diff -urN util-vserver-0.30.212.org/scripts/util-vserver-vars.pathsubst util-vserver-0.30.212/scripts/util-vserver-vars.pathsubst ---- util-vserver-0.30.212.org/scripts/util-vserver-vars.pathsubst 2006-12-09 17:15:24.000000000 +0100 -+++ util-vserver-0.30.212/scripts/util-vserver-vars.pathsubst 2007-02-04 18:20:38.673246000 +0100 -@@ -51,6 +51,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" -+_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK="$__PKGLIBDIR/vserver-build.functions.poldek" +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/util-vserver-vars.pathsubst util-vserver-0.30.216-pre3126/scripts/util-vserver-vars.pathsubst +--- util-vserver-0.30.216-pre3126.org/scripts/util-vserver-vars.pathsubst 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/util-vserver-vars.pathsubst 2021-03-12 21:50:25.807681091 +0100 +@@ -58,6 +58,7 @@ _LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKG + _LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGDATADIR/vserver-build.functions.yum" + _LIB_VSERVER_BUILD_FUNCTIONS_URPMI="$__PKGDATADIR/vserver-build.functions.urpmi" + _LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGDATADIR/vserver-build.functions.pkgmgmt" ++_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK="$__PKGDATADIR/vserver-build.functions.poldek" _LISTDEVIP="$__LEGACYDIR/listdevip" - _LOCKFILE="$__PKGLIBDIR/lockfile" - _MASK2PREFIX="$__PKGLIBDIR/mask2prefix" -@@ -99,6 +100,8 @@ - _VUNIFY="$__PKGLIBDIR/vunify" + _LOCKFILE="$__PKGLIBEXECDIR/lockfile" + _MASK2PREFIX="$__PKGLIBEXECDIR/mask2prefix" +@@ -116,6 +117,8 @@ _VURPM="$__SBINDIR/vurpm" + _VURPM_WORKER="$__PKGLIBEXECDIR/vurpm-worker" _VYUM="$__SBINDIR/vyum" - _VYUM_WORKER="$__PKGLIBDIR/vyum-worker" + _VYUM_WORKER="$__PKGLIBEXECDIR/vyum-worker" +_VPOLDEK="$__SBINDIR/vpoldek" -+_VPOLDEK_WORKER="$__PKGLIBDIR/vpoldek-worker" ++_VPOLDEK_WORKER="$__PKGLIBEXECDIR/vpoldek-worker" _AWK="@AWK@" _BZIP2="@BZIP2@" -diff -urN util-vserver-0.30.212.org/scripts/vpkg util-vserver-0.30.212/scripts/vpkg ---- util-vserver-0.30.212.org/scripts/vpkg 2006-12-09 17:15:24.000000000 +0100 -+++ util-vserver-0.30.212/scripts/vpkg 2007-02-04 18:20:38.673246000 +0100 -@@ -115,6 +115,44 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vpkg util-vserver-0.30.216-pre3126/scripts/vpkg +--- util-vserver-0.30.216-pre3126.org/scripts/vpkg 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vpkg 2021-03-12 21:50:25.807681091 +0100 +@@ -115,6 +115,44 @@ case "$style" in fi fi ;; @@ -1302,14 +580,14 @@ diff -urN util-vserver-0.30.212.org/scripts/vpkg util-vserver-0.30.212/scripts/v (debian) case "$tag" in (get-conffiles) -diff -urN util-vserver-0.30.212.org/scripts/vpoldek util-vserver-0.30.212/scripts/vpoldek ---- util-vserver-0.30.212.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/scripts/vpoldek 2007-02-04 18:20:38.673246000 +0100 -@@ -0,0 +1,96 @@ +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) 2003 Enrico Scholz ++# Copyright (C) 2007 Enrico Scholz +# +# 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 @@ -1324,7 +602,7 @@ diff -urN util-vserver-0.30.212.org/scripts/vpoldek util-vserver-0.30.212/script +# 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/lib/util-vserver/util-vserver-vars} ++: ${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 @@ -1348,63 +626,41 @@ diff -urN util-vserver-0.30.212.org/scripts/vpoldek util-vserver-0.30.212/script +$"vpoldek $PACKAGE_VERSION -- poldek for vservers +This program is part of $PACKAGE_STRING + -+Copyright (C) 2003 Enrico Scholz ++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 +} + -+is_quiet= -+declare -a vservers=() ++tmp=$(getopt -o +q --long help,version,debug,quiet,all -n "$0" -- "$@") || exit 1 ++eval set -- "$tmp" ++ ++declare -a send_through poldek_opts + -+while test "$#" -ge 1; do ++while true; do + case "$1" in -+ --) shift; break;; -+ --help) showHelp $0;; -+ --quiet|-q) is_quiet=1 ;; -+ --all) -+ getAllVservers tmp -+ vservers=( "${vservers[@]}" "${tmp[@]}" ) -+ ;; -+ --version) -+ showVersion ;; -+ *) vservers=( "${vservers[@]}" "$1" ) -+ esac -+ shift ++ (--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 + -+cnt=0 -+res=255 -+for i in "${vservers[@]}"; do -+ cnt=$[ cnt + 1 ] ++VSOMETHING_TITLE=vpoldek ++VSOMETHING_WORKER=$_VPOLDEK_WORKER ++VSOMETHING_PKGMGMT=1 + -+ test -n "$is_quiet" || { -+ colorize bold echo -n "vpoldek: operating on vserver " -+ colorize bold colorize emph echo "$i" -+ xtermTitle "vpoldek: operating on vserver '$i' [$cnt/${#vservers[@]}]" -+ } -+ -+ if pkgmgmt.isInternal "$i"; then -+ $_VSERVER "$i" exec poldek "$@" -+ else -+ callInNamespace "$i" \ -+ "$_VNAMESPACE" --new -- "$_VPOLDEK_WORKER" "$i" "$@" -+ fi -+ res=$? -+ -+ test $res -eq 0 -o -n "$is_quiet" || { -+ colorize error echo -n $"vpoldek failed on vserver '$i' with errorcode $res" -+ echo -+ } -+ -+ test -n "$is_quiet" || echo -+done ++export VSOMETHING_TITLE VSOMETHING_WORKER VSOMETHING_PKGMGMT + -+test "$cnt" -ge 0 || echo "No vservers specified" >&2 -+exit $res -diff -urN util-vserver-0.30.212.org/scripts/vpoldek-worker util-vserver-0.30.212/scripts/vpoldek-worker ---- util-vserver-0.30.212.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/scripts/vpoldek-worker 2007-02-04 18:20:38.673246000 +0100 ++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$ @@ -1426,7 +682,7 @@ diff -urN util-vserver-0.30.212.org/scripts/vpoldek-worker util-vserver-0.30.212 + +set -e + -+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} ++: ${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 @@ -1451,32 +707,32 @@ diff -urN util-vserver-0.30.212.org/scripts/vpoldek-worker util-vserver-0.30.212 + --conf=$POLDEK_CONFIG \ + --pmcmd=$RPM_BINARY \ + "$@" -diff -urN util-vserver-0.30.212.org/scripts/vserver-build util-vserver-0.30.212/scripts/vserver-build ---- util-vserver-0.30.212.org/scripts/vserver-build 2006-12-09 17:15:24.000000000 +0100 -+++ util-vserver-0.30.212/scripts/vserver-build 2007-02-04 18:20:38.673246000 +0100 -@@ -57,6 +57,9 @@ - yum ... -- -d +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 -m + poldek ... -- -d + ... installs the base-packages of the given distribution with + help of 'vpoldek' rpm ... -- [-d ] --empty|([--force] [--nodeps] )+ ... installs lists of rpm-packages skeleton ... -- [ *] -@@ -134,7 +137,7 @@ +@@ -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) -+ (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xpoldek) - . $__PKGLIBDIR/vserver-build.$method +- (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 -urN util-vserver-0.30.212.org/scripts/vserver-build.functions util-vserver-0.30.212/scripts/vserver-build.functions ---- util-vserver-0.30.212.org/scripts/vserver-build.functions 2006-12-09 17:15:24.000000000 +0100 -+++ util-vserver-0.30.212/scripts/vserver-build.functions 2007-02-04 18:20:38.673246000 +0100 -@@ -167,6 +167,12 @@ +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 @@ -1489,10 +745,10 @@ diff -urN util-vserver-0.30.212.org/scripts/vserver-build.functions util-vserver elif test -n "$1"; then DISTRIBUTION=$1 else -diff -urN util-vserver-0.30.212.org/scripts/vserver-build.functions.poldek util-vserver-0.30.212/scripts/vserver-build.functions.poldek ---- util-vserver-0.30.212.org/scripts/vserver-build.functions.poldek 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/scripts/vserver-build.functions.poldek 2007-02-04 18:20:38.673246000 +0100 -@@ -0,0 +1,67 @@ +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 @@ -1547,23 +803,39 @@ diff -urN util-vserver-0.30.212.org/scripts/vserver-build.functions.poldek util- + +function poldek.initFilesystem +{ -+ mkdir -p "$PKGCFGDIR"/poldek/etc -+ mkdir -p "$PKGCFGBASE"/poldek-cache ++ mkdir -p "$PKGCFGDIR"/poldek/etc/repos.d + -+ $_LN_S "$PKGCFGBASE"/poldek-cache "$PKGCFGDIR"/poldek/cache ++ $_LN_S "$__CONFDIR"/.defaults/cachebase/poldek "$PKGCFGDIR"/poldek/cache + + populateDirectory "$PKGCFGDIR/poldek/etc" \ + "$__DISTRIBDIR/defaults/poldek" \ + "$__DISTRIBDIR/$DISTRIBUTION/poldek" \ + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek" + -+# test -z "$POLDEKCONFDEFAULT" || \ -+# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/ ++ 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 -urN util-vserver-0.30.212.org/scripts/vserver-build.poldek util-vserver-0.30.212/scripts/vserver-build.poldek ---- util-vserver-0.30.212.org/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.212/scripts/vserver-build.poldek 2007-02-04 18:20:38.701247750 +0100 -@@ -0,0 +1,64 @@ +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 @@ -1581,7 +853,7 @@ diff -urN util-vserver-0.30.212.org/scripts/vserver-build.poldek util-vserver-0. +# 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 -n "$0" -- "$@") || exit 1 ++tmp=$(getopt -o +d:,m: --long debug -n "$0" -- "$@") || exit 1 +eval set -- "$tmp" + +. "$_LIB_VSERVER_BUILD_FUNCTIONS_RPM" @@ -1591,6 +863,7 @@ diff -urN util-vserver-0.30.212.org/scripts/vserver-build.poldek util-vserver-0. +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