X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-vserver-pld.patch;h=1449eeeb9c264cc2b4ddac6236a88a1e82124ba4;hb=c62564902319d53612c5af8101bf201b8cf21460;hp=872a4012330ebc14347c50288c3da9a231c24e0e;hpb=b7494608568143a6df417b925d3318624c745040;p=packages%2Futil-vserver.git diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch index 872a401..1449eee 100644 --- a/util-vserver-pld.patch +++ b/util-vserver-pld.patch @@ -1,1052 +1,225 @@ ---- util-vserver-0.30.214.org/distrib/Makefile.am 2007-09-02 22:06:42.000000000 +0200 -+++ util-vserver-0.30.214/distrib/Makefile.am 2007-11-15 23:20:48.177838628 +0100 -@@ -73,7 +73,13 @@ - breezy/debootstrap.script dapper/debootstrap.script \ - edgy/debootstrap.script feisty/debootstrap.script \ - gutsy/debootstrap.script hoary/debootstrap.script \ -- warty/debootstrap.script -+ warty/debootstrap.script \ +--- 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 +--- 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 \ ++ 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 \ +@@ -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\ + 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 \ -+ pld-ti/pkgs/01 pld-ti/rpm/macros \ -+ pld-ti/rpmlist.d/00.lst ++ pld-ti/pkgs/01 pld-ti/rpm/macros nobase_confdistrib_DATA = rh9/apt/sources.list \ fc1/apt/sources.list \ -@@ -83,7 +89,23 @@ +@@ -95,7 +99,10 @@ 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-ti/poldek/aliases.conf \ -+ pld-ti/poldek/fetch.conf \ -+ pld-ti/poldek/pld-source.conf \ -+ pld-ti/poldek/poldek.conf \ -+ pld-ti/poldek/source.conf -+ ++ pld-ac/poldek/repos.d/pld.conf \ ++ pld-th/poldek/repos.d/pld.conf \ ++ pld-ti/poldek/repos.d/pld.conf AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \ = $(nobase_distrib_SCRIPTS) ---- util-vserver-0.30.214.org/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/pkgs/01 2007-11-15 23:20:48.181172125 +0100 -@@ -0,0 +1,5 @@ +--- 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 -+glibc ++filesystem ++glibc-misc +issue +rpm-base +vserver-packages ---- util-vserver-0.30.214.org/distrib/pld-ac/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/poldek/aliases.conf 2007-11-15 23:20:48.181172125 +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 -+ ---- util-vserver-0.30.214.org/distrib/pld-ac/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/poldek/fetch.conf 2007-11-15 23:20:48.181172125 +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 -+ -+ ---- util-vserver-0.30.214.org/distrib/pld-ac/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/poldek/pld-source.conf 2007-11-15 23:20:48.181172125 +0100 -@@ -0,0 +1,44 @@ +--- 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 ++# PLD Linux Distribution . ++ ++# 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} ++_prefix = %{_pld_main_prefix} + -+ -+_ac_idxtype = pndir ++_type = pndir + +# PLD 2.0 (Ac) +[source] -+type = %{_ac_idxtype} -+name = ac -+path = %{_pld_prefix}/PLD/%{_pld_arch}/PLD/RPMS/ -+#signed = yes -+ -+[source] -+type = %{_ac_idxtype} -+name = ac-updates -+path = %{_pld_prefix}/updates/%{_pld_arch}/ -+#signed = yes ++type = %{_type} ++name = ac ++path = %{_prefix}/PLD/%{_arch}/PLD/RPMS/ ++signed = yes ++# buggy deps -- use one from updates instead ++ignore = msmtp-sendmail* ++pri = 1 + +[source] -+type = %{_ac_idxtype} -+name = ac-supported -+path = %{_pld_prefix}/supported/%{_pld_arch}/ -+noauto = yes -+#signed = yes ++type = %{_type} ++name = ac-updates ++path = %{_prefix}/updates/%{_arch}/ ++signed = yes ++pri = 1 + +[source] -+type = %{_ac_idxtype} -+name = ac-ready -+path = %{_pld_prefix}/ready/%{_pld_arch}/ -+noauto = yes ++type = %{_type} ++name = ac-supported ++path = %{_prefix}/supported/%{_arch}/ ++auto = no ++autoup = no ++signed = yes + +[source] -+type = %{_ac_idxtype} -+name = ac-test -+path = %{_pld_prefix}/test/%{_pld_arch}/ -+noauto = yes ---- util-vserver-0.30.214.org/distrib/pld-ac/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/poldek/poldek.conf 2007-11-15 23:20:48.181172125 +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 ---- util-vserver-0.30.214.org/distrib/pld-ac/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/poldek/source.conf 2007-11-15 23:20:48.181172125 +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}/ ++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 -+ ---- util-vserver-0.30.214.org/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2007-11-15 23:20:48.181172125 +0100 -@@ -0,0 +1,4 @@ +--- 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' +%_install_langs C:en:pl -+%_netsharedpath /dev ---- util-vserver-0.30.214.org/distrib/pld-ac/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/rpmlist.d/00.lst 2007-11-15 23:20:48.181172125 +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 ---- util-vserver-0.30.214.org/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/pkgs/01 2007-11-15 23:20:48.181172125 +0100 -@@ -0,0 +1,5 @@ ++%_netsharedpath /dev:/proc ++%_tmppath /tmp ++%_host_os %_os +--- 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 -+glibc ++filesystem ++glibc-misc +issue +rpm-base +vserver-packages ---- util-vserver-0.30.214.org/distrib/pld-th/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/poldek/aliases.conf 2007-11-15 23:20:48.181172125 +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 -+ ---- util-vserver-0.30.214.org/distrib/pld-th/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/poldek/fetch.conf 2007-11-15 23:20:48.181172125 +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 -+ -+ ---- util-vserver-0.30.214.org/distrib/pld-th/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/poldek/pld-source.conf 2007-11-15 23:20:48.181172125 +0100 -@@ -0,0 +1,51 @@ -+# PLD -+ -+_pld_arch = %ARCH% -+_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th +--- 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 . ++ ++_arch = %ARCH% ++_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 ++#_prefix = ftp://ftp.task.pld-linux.org/dists/th + -+ -+_th_idxtype = pndir ++_type = pndir + +# PLD 3.0 (Th) +[source] -+type = %{_th_idxtype} -+name = th -+path = %{_pld_prefix}/PLD/%{_pld_arch}/RPMS/ -+ -+[source] -+type = %{_th_idxtype} -+name = th -+path = %{_pld_prefix}/PLD/noarch/RPMS/ ++type = %{_type} ++name = th ++path = %{_prefix}/PLD/%{_arch}/RPMS/ + +[source] -+type = %{_th_idxtype} -+name = th-updates-security -+path = %{_pld_prefix}/updates-security/%{_pld_arch}/RPMS/ ++type = %{_type} ++name = th ++path = %{_prefix}/PLD/noarch/RPMS/ + -+[source] -+type = %{_th_idxtype} -+name = th-updates-general -+path = %{_pld_prefix}/updates-general/%{_pld_arch}/RPMS/ -+noauto = yes ++#[source] ++#type = %{_type} ++#name = th-updates ++#path = %{_prefix}/updates/%{_arch}/RPMS/ ++# ++#[source] ++#type = %{_type} ++#name = th-updates ++#path = %{_prefix}/updates/noarch/RPMS/ + +#[source] -+#type = %{_th_idxtype} -+#name = th-supported -+#path = %{_pld_prefix}/supported/%{_pld_arch}/RPMS/ -+#noauto = yes ++#type = %{_type} ++#name = th-supported ++#path = %{_prefix}/supported/%{_arch}/ ++#auto = no + +[source] -+type = %{_th_idxtype} -+name = th-ready -+path = %{_pld_prefix}/ready/%{_pld_arch}/RPMS/ -+noauto = yes ++type = %{_type} ++name = th-ready ++path = %{_prefix}/ready/%{_arch}/RPMS/ ++auto = no ++autoup = no + +[source] -+type = %{_th_idxtype} -+name = th-test -+path = %{_pld_prefix}/test/%{_pld_arch}/RPMS/ -+noauto = yes ---- util-vserver-0.30.214.org/distrib/pld-th/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/poldek/poldek.conf 2007-11-15 23:20:48.184505622 +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 ---- util-vserver-0.30.214.org/distrib/pld-th/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/poldek/source.conf 2007-11-15 23:20:48.184505622 +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 = th-ready ++path = %{_prefix}/ready/noarch/RPMS/ ++auto = no ++autoup = no + +[source] -+name = home -+type = dir -+path = $HOME/rpm/RPMS -+auto = no ++type = %{_type} ++name = th-test ++path = %{_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 -+ ---- 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 -@@ -0,0 +1,4 @@ ++[source] ++type = %{_type} ++name = th-test ++path = %{_prefix}/test/noarch/RPMS/ ++auto = no ++autoup = no +--- 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' +%_install_langs C:en:pl -+%_netsharedpath /dev ---- util-vserver-0.30.214.org/distrib/pld-th/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/rpmlist.d/00.lst 2007-11-15 23:20:48.184505622 +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 ---- util-vserver-0.30.214.org/distrib/pld-ti/pkgs/01 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2007-11-15 23:20:48.217840583 +0100 -@@ -0,0 +1,5 @@ ++%_netsharedpath /dev:/proc ++%_tmppath /tmp ++%_host_os %_os +--- 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 -+glibc ++filesystem ++glibc-misc +issue +rpm-base +vserver-packages ---- util-vserver-0.30.214.org/distrib/pld-ti/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/poldek/aliases.conf 2007-11-15 23:20:48.217840583 +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 -+ ---- util-vserver-0.30.214.org/distrib/pld-ti/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/poldek/fetch.conf 2007-11-15 23:20:48.217840583 +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 -+ -+ ---- util-vserver-0.30.214.org/distrib/pld-ti/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/poldek/pld-source.conf 2007-11-15 23:20:48.217840583 +0100 +--- 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 @@ -1094,301 +267,17 @@ +path = %{_prefix}/test/noarch/RPMS/ +auto = no +autoup = no ---- util-vserver-0.30.214.org/distrib/pld-ti/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/poldek/poldek.conf 2007-11-15 23:20:48.217840583 +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 ---- util-vserver-0.30.214.org/distrib/pld-ti/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/poldek/source.conf 2007-11-15 23:20:48.217840583 +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 = -+ -+[source] -+name = home -+type = dir -+path = $HOME/rpm/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 -+ ---- 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 -@@ -0,0 +1,4 @@ +--- 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' +%_install_langs C:en:pl -+%_netsharedpath /dev ---- util-vserver-0.30.214.org/distrib/pld-ti/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/rpmlist.d/00.lst 2007-11-15 23:20:48.221174080 +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 ---- 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 ++%_netsharedpath /dev:/proc ++%_tmppath /tmp ++%_host_os %_os +--- 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 } @@ -1418,7 +307,7 @@ *) 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 @@ -1427,7 +316,7 @@ 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 } @@ -1455,8 +344,8 @@ 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 +--- 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 \ @@ -1465,7 +354,7 @@ 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 \ @@ -1479,7 +368,7 @@ 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 \ @@ -1487,7 +376,7 @@ 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 \ @@ -1495,8 +384,8 @@ 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 +--- 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 @@ " @@ -1658,9 +547,9 @@ (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 @@ +--- 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" @@ -1668,7 +557,7 @@ _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" @@ -1677,8 +566,8 @@ _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 +--- 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 @@ -1724,8 +613,8 @@ (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 +--- 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$ @@ -1801,8 +690,8 @@ + +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 +--- 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$ @@ -1849,8 +738,8 @@ + --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 +--- 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 ... installs the base-packages of the given distribution with @@ -1870,9 +759,9 @@ . $__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 @@ +--- 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 @@ -1885,9 +774,9 @@ elif test -n "$1"; then DISTRIBUTION=$1 else ---- util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2007-11-15 23:20:48.224507577 +0100 -+++ util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 19:20:07.685144000 +0200 -@@ -0,0 +1,72 @@ +--- 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 -*-- + +# Copyright (C) 2003 Enrico Scholz @@ -1943,9 +832,8 @@ +function poldek.initFilesystem +{ + mkdir -p "$PKGCFGDIR"/poldek/etc/repos.d -+ mkdir -p "$PKGCFGBASE"/poldek-cache + -+ $_LN_S "$PKGCFGBASE"/poldek-cache "$PKGCFGDIR"/poldek/cache ++ $_LN_S "$__CONFDIR"/.defaults/cachebase/poldek "$PKGCFGDIR"/poldek/cache + + populateDirectory "$PKGCFGDIR/poldek/etc" \ + "$__DISTRIBDIR/defaults/poldek" \ @@ -1957,12 +845,22 @@ + "$__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 ++ +# test -z "$POLDEKCONFDEFAULT" || \ +# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/ +} ---- util-vserver-0.30.214.org/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/scripts/vserver-build.poldek 2007-11-15 23:20:48.224507577 +0100 -@@ -0,0 +1,64 @@ +--- 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 -*-- + +# Copyright (C) 2003 Enrico Scholz @@ -1980,7 +878,7 @@ +# 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" @@ -1990,6 +888,7 @@ +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