1 diff -urN util-vserver-0.30.214.org/distrib/Makefile.am util-vserver-0.30.214/distrib/Makefile.am
2 --- util-vserver-0.30.214.org/distrib/Makefile.am 2007-09-02 22:06:42.000000000 +0200
3 +++ util-vserver-0.30.214/distrib/Makefile.am 2007-11-15 23:20:48.177838628 +0100
5 breezy/debootstrap.script dapper/debootstrap.script \
6 edgy/debootstrap.script feisty/debootstrap.script \
7 gutsy/debootstrap.script hoary/debootstrap.script \
8 - warty/debootstrap.script
9 + warty/debootstrap.script \
10 + pld-ac/pkgs/01 pld-ac/rpm/macros \
11 + pld-ac/rpmlist.d/00.lst \
12 + pld-th/pkgs/01 pld-th/rpm/macros \
13 + pld-th/rpmlist.d/00.lst \
14 + pld-ti/pkgs/01 pld-ti/rpm/macros \
15 + pld-ti/rpmlist.d/00.lst
17 nobase_confdistrib_DATA = rh9/apt/sources.list \
18 fc1/apt/sources.list \
20 fc5/apt/sources.list \
21 fc6/apt/sources.list \
23 - suse91/apt/sources.list
24 + suse91/apt/sources.list \
25 + pld-ac/poldek/aliases.conf \
26 + pld-ac/poldek/fetch.conf \
27 + pld-ac/poldek/pld-source.conf \
28 + pld-ac/poldek/poldek.conf \
29 + pld-ac/poldek/source.conf \
30 + pld-th/poldek/aliases.conf \
31 + pld-th/poldek/fetch.conf \
32 + pld-th/poldek/pld-source.conf \
33 + pld-th/poldek/poldek.conf \
34 + pld-th/poldek/source.conf \
35 + pld-ti/poldek/aliases.conf \
36 + pld-ti/poldek/fetch.conf \
37 + pld-ti/poldek/pld-source.conf \
38 + pld-ti/poldek/poldek.conf \
39 + pld-ti/poldek/source.conf
42 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
43 = $(nobase_distrib_SCRIPTS)
44 diff -urN util-vserver-0.30.214.org/distrib/pld-ac/pkgs/01 util-vserver-0.30.214/distrib/pld-ac/pkgs/01
45 --- util-vserver-0.30.214.org/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100
46 +++ util-vserver-0.30.214/distrib/pld-ac/pkgs/01 2007-11-15 23:20:48.181172125 +0100
53 diff -urN util-vserver-0.30.214.org/distrib/pld-ac/poldek/aliases.conf util-vserver-0.30.214/distrib/pld-ac/poldek/aliases.conf
54 --- util-vserver-0.30.214.org/distrib/pld-ac/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100
55 +++ util-vserver-0.30.214/distrib/pld-ac/poldek/aliases.conf 2007-11-15 23:20:48.181172125 +0100
57 +# System wide aliases
65 +freshen = install -FN
68 +# for backward compatybility, greedy is on by default now
69 +greedy-upgrade = install -FG
71 +just-install = install -IN
74 +what-requires = search -r
75 +what-provides = search -p
76 +rsearch = search --perlre
81 +#ls = uninstall kernel
87 diff -urN util-vserver-0.30.214.org/distrib/pld-ac/poldek/fetch.conf util-vserver-0.30.214/distrib/pld-ac/poldek/fetch.conf
88 --- util-vserver-0.30.214.org/distrib/pld-ac/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100
89 +++ util-vserver-0.30.214/distrib/pld-ac/poldek/fetch.conf 2007-11-15 23:20:48.181172125 +0100
91 +# Configuration of poldek external file getters. Each [fetcher] section
92 +# declares one external downloader. The syntax is:
95 +# proto = PROTOCOL[ ,PROTOCOL... ]
96 +# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO
97 +# Possible parameters are:
100 +# Unique name of the fetcher. This is an optional parameter, if not set then
101 +# name is taken from the "cmd" parameter value as "$(basename $cmd)".
104 +# Protocol or protocols supported by fetcher. Name of the protocol can be
105 +# completely arbitrary, i.e. if you can handle protocol "foo" by writing
106 +# a script which takes URLs in form 'foo://'.
109 +# Parameter specifies an external command and its invoking syntax.
110 +# The syntax of "cmd" is:
111 +# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n]
112 +# Where COMMAND is the name or full path of command, OPTION is command specific
113 +# options. Macro '%d' is replaced with cache directory, '%D' is replaced with
114 +# 'cache directory/file basename', and '%p' with file basename, %P with file full
115 +# path (URL). Optional suffix 'n' with %p and %P means that command can be
116 +# invoked with multiple files at once.
117 +#cmd = foogetter.sh -N %D %Pn
119 +##Configured fetchers
122 +cmd = vfjuggle %d %Pn
125 +proto = http,ftp,https
126 +cmd = wget -N --dot-style=binary -P %d %Pn
138 +cmd = rsync -v %P %d
142 +cmd = vfsmb -v %P %d
146 +#cmd = vfssh.sh %d %Pn
150 +#cmd = foo.sh %d %Pn
153 diff -urN util-vserver-0.30.214.org/distrib/pld-ac/poldek/pld-source.conf util-vserver-0.30.214/distrib/pld-ac/poldek/pld-source.conf
154 --- util-vserver-0.30.214.org/distrib/pld-ac/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100
155 +++ util-vserver-0.30.214/distrib/pld-ac/poldek/pld-source.conf 2007-11-15 23:20:48.181172125 +0100
158 +# PLD <http://www.pld-linux.org/>
161 +_pld_prefix = ftp://ftp.ac.pld-linux.org/dists/ac
163 +## You can use them if you have better connection there
165 +#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/ac
172 +type = %{_ac_idxtype}
174 +path = %{_pld_prefix}/PLD/%{_pld_arch}/PLD/RPMS/
178 +type = %{_ac_idxtype}
180 +path = %{_pld_prefix}/updates/%{_pld_arch}/
184 +type = %{_ac_idxtype}
186 +path = %{_pld_prefix}/supported/%{_pld_arch}/
191 +type = %{_ac_idxtype}
193 +path = %{_pld_prefix}/ready/%{_pld_arch}/
197 +type = %{_ac_idxtype}
199 +path = %{_pld_prefix}/test/%{_pld_arch}/
201 diff -urN util-vserver-0.30.214.org/distrib/pld-ac/poldek/poldek.conf util-vserver-0.30.214/distrib/pld-ac/poldek/poldek.conf
202 --- util-vserver-0.30.214.org/distrib/pld-ac/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100
203 +++ util-vserver-0.30.214/distrib/pld-ac/poldek/poldek.conf 2007-11-15 23:20:48.181172125 +0100
205 +# poldek main configuration file.
207 +# Some macros. Macros are local, they are not visible in included files
208 +# and macros declared in them are not visible to includer.
209 +# Macros names starts with underscore '_'.
213 +# Both local and remote files may be included. Included files may not contain
214 +# [global] section, it will be ignored anyway.
215 +%include %{_distro}-source.conf
218 +%include source.conf
220 +# External downloaders configuration, not necessary in most cases, cause
221 +# to internal HTTP and FTP client.
222 +#%include fetch.conf
227 +# This parameter allows to configure the default repository index type.
228 +#default index type = pndir
230 +# Cache directory for downloaded files. NOTE: that parent directory of cachedir
232 +#cachedir = $HOME/.poldek-cache
234 +# Switch to ordinary user at startup when executed by root
237 +# Permits using root privileges for installation only. Automatically turned
238 +# on when poldek executed as ordinary user.
241 +# Load /etc/apt/sources.list.
242 +#load apt sources list = no
244 +# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2).
245 +# This option is a workaround for broken zlib linked into librpm; with enabled
246 +# 'auto zlib in rpm' poldek tries to detect such case and then enables external
247 +# *.gz handling automatically.
248 +#vfile external compress = no
250 +# Auto detection of zlib linked into librpm. See 'vfile external compress'
252 +#auto zlib in rpm = yes
254 +# Automatically download whole index if incremental update fails.
257 +# Do not save given paths into created indexes. This option may significantly
258 +# reduce index size. Example (notice missing starting '/'):
259 +# exclude path = usr/share/doc:usr/share/man:usr/src
262 +# Full path name to a PM (rpm for now) binary.
263 +#pm command = /bin/rpm
265 +# Full path name to sudo binary.
266 +#sudo command = /usr/bin/sudo
269 +### File downloaders configuration
271 +# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default
272 +# 'poldek@znienacka.net' is sent)
273 +#vfile ftp sysuser as anon passwd = no
275 +# File getters configuration parameter. By this option URL handlers may be configured.
276 +# To get file from HTTP and FTP servers poldek uses its internal client (what is
277 +# recommended), although it can be changedby this option. Others protocols handled
278 +# by external utilities can be configured also. The syntax is:
279 +# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME
281 +# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch]
282 +# sections (placed in fetch.conf in default configuration).
284 +# default fetcher = ftp,http:internal
285 +# default fetcher = https:wget
286 +# default fetcher = cdrom:vfjuggle
287 +# vfjuggle is a cdrom getter supplied with poldek.
288 +#default fetcher = http,ftp: internal
290 +# Proxies for internal FTP and HTTP client may be configured in usual
291 +# way, by environment variables ftp_proxy and http_proxy, or by this option.
292 +# Its syntax is similar to "default fetcher" one:
293 +# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL
295 +# proxy = http: http://w3cache.foo.org:8080
298 +# Comma separated list of hosts or domains which will not be accessed via proxy.
299 +# Option overrides no_proxy environment variable.
301 +# noproxy = localhost, .pl, ftp.foo.bar.org
304 +# Internal HTTP and FTP client is stubborn, it retries to retrive
305 +# file if connection breaks. This option tells it how many times
307 +#vfile retries = 128
310 +### Installation options
312 +# Install packages in small groups instead of doing all-or-nothing
314 +particle install = no
316 +# Do not remove downloaded packages after its successful installation.
317 +#keep downloads = no
319 +# Controls visibility of multiple package instances with different EVR.
320 +# If on, only one, highest version will be visible.
321 +#unique package names = no
323 +# Epoch autopromotion during dependency comparision. RPM specific.
324 +# Set it up if you are using system with rpm prior to 4.2.1 version.
327 +# Confirm packages installation.
328 +#confirm installation = no
330 +# Confirm packages removal.
331 +#confirm removal = yes
333 +# Let the user select package among equivalents.
334 +choose equivalents manually = yes
336 +# Prevent package listed from being upgraded if they are already installed.
337 +# hold = kernel* dev
340 +# Ignore package list - packages fits given mask will be invisible.
341 +# ignore = *-smp-* foo*
342 +ignore = kernel* udev devfs
344 +# Conflicts with already installed packages are treated as resolved
345 +# if at least one of multiple-installed package satisfies conflict.
346 +# rpm doesn't support such cases, so --pm-nodeps is needed (use with
348 +#allow duplicates = yes
351 +### RPM specific options
353 +# rpm macros can be set by this option. Examples:
354 +# rpmdef = _install_langs pl:pl_PL:lt:lt_LT
355 +# Do not install any documentation:
356 +# rpmdef = _netsharedpath /usr/share/info:/usr/share/man
357 +# rpmdef = _excludedocs 1
361 +### Dependency processing settings
362 +# Subtle dependency processing options, they should not be changed
363 +# unless you know what you are doing
365 +# Automatically install packages required by installed ones.
368 +# Greedy upgrades, i.e. upgrade packages which dependencies are broken
369 +# by being uninstalled ones.
372 +# Be yet more greedy; if successor of orphaned package found, and this
373 +# successor drags no packages then upgrade the package instead of process
374 +# its dependencies. Option value is implied by 'greedy' one by defalut.
375 +#aggressive greedy = yes
377 +# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g.
378 +# package A requires capability foo >= 1.0 while package B provides "foo"
379 +# without any version. Use with care, it may cause weird dependency errors.
382 +# Taking into account package Obsoletes.
385 +# Taking into account package Conflicts.
387 diff -urN util-vserver-0.30.214.org/distrib/pld-ac/poldek/source.conf util-vserver-0.30.214/distrib/pld-ac/poldek/source.conf
388 --- util-vserver-0.30.214.org/distrib/pld-ac/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100
389 +++ util-vserver-0.30.214/distrib/pld-ac/poldek/source.conf 2007-11-15 23:20:48.181172125 +0100
391 +# Sample poldek sources configuration
392 +# Every source is configured in his own [source] section.
393 +# Possible parameters are:
396 +# Unique name of the repository.
399 +# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum'
400 +# and 'dir' as listed by --stl switch.
403 +# This parameter sets index original type i.e type of repository
404 +# from what this repository is created. Default is 'dir' - means
405 +# that directory of packages is scanned.
406 +#original type = dir
408 +# Unique name of the repository. May be either path or URL.
409 +#path = /some/url/or/dir
411 +# If package index and packages are stored in different locations then
412 +# prefix stands for packages path.
413 +#prefix = /some/url/or/dir
415 +# Controls visibility of multiple package instances with different EVR.
416 +# If on, only one, highest version will be visible.
419 +# Repository priority. If the same packages (equal names and EVR)
420 +# are available in more than one source then package from highest
421 +# prioritized source are taken. Priority is numeric value. Lower number
422 +# means higher priority, and negative priorities are allowed.
423 +# Priority is numeric value.
426 +# Controling if repository index will be implicit loaded. Set it off if
427 +# the index should be loaded on demand only, i.e. if specified directly
431 +# Controls if repository index will be implicit updated. Set it off if
432 +# the index should be updated on demand only, i.e. if specified directly
436 +# Packages PGP/GPG signatures (if any) will be verified before their
440 +# Have the same meaning as [global] parameter. Example:
441 +# hold = kernel* dev
444 +# Have the same meaning as [global] parameter. Example:
445 +# ignore = kernel*smp* dev
448 +# Parameter have the same meaning as [global] parameter.
449 +# exclude path = usr/share/doc:usr/share/man:usr/src
452 +# Preferred language of package descriptions. If not set, taken from locale
453 +# settings. Example:
454 +# lang = pl_PL:lt_LT
460 +path = $HOME/rpm/RPMS
467 +#path = ftp://ftp.foo.bar.org/RPMS/
473 +#ignore = kernel*-smp-*
476 diff -urN util-vserver-0.30.214.org/distrib/pld-ac/rpm/macros util-vserver-0.30.214/distrib/pld-ac/rpm/macros
477 --- util-vserver-0.30.214.org/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100
478 +++ util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2007-11-15 23:20:48.181172125 +0100
480 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
481 +# you have to use at least one language beside 'C'
482 +%_install_langs C:en:pl
483 +%_netsharedpath /dev
484 diff -urN util-vserver-0.30.214.org/distrib/pld-ac/rpmlist.d/00.lst util-vserver-0.30.214/distrib/pld-ac/rpmlist.d/00.lst
485 --- util-vserver-0.30.214.org/distrib/pld-ac/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100
486 +++ util-vserver-0.30.214/distrib/pld-ac/rpmlist.d/00.lst 2007-11-15 23:20:48.181172125 +0100
497 +vserver-packages-*.rpm
498 diff -urN util-vserver-0.30.214.org/distrib/pld-th/pkgs/01 util-vserver-0.30.214/distrib/pld-th/pkgs/01
499 --- util-vserver-0.30.214.org/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100
500 +++ util-vserver-0.30.214/distrib/pld-th/pkgs/01 2007-11-15 23:20:48.181172125 +0100
507 diff -urN util-vserver-0.30.214.org/distrib/pld-th/poldek/aliases.conf util-vserver-0.30.214/distrib/pld-th/poldek/aliases.conf
508 --- util-vserver-0.30.214.org/distrib/pld-th/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100
509 +++ util-vserver-0.30.214/distrib/pld-th/poldek/aliases.conf 2007-11-15 23:20:48.181172125 +0100
511 +# System wide aliases
519 +freshen = install -FN
520 +upgrade = install -F
522 +# for backward compatybility, greedy is on by default now
523 +greedy-upgrade = install -FG
525 +just-install = install -IN
528 +what-requires = search -r
529 +what-provides = search -p
530 +rsearch = search --perlre
535 +#ls = uninstall kernel
541 diff -urN util-vserver-0.30.214.org/distrib/pld-th/poldek/fetch.conf util-vserver-0.30.214/distrib/pld-th/poldek/fetch.conf
542 --- util-vserver-0.30.214.org/distrib/pld-th/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100
543 +++ util-vserver-0.30.214/distrib/pld-th/poldek/fetch.conf 2007-11-15 23:20:48.181172125 +0100
545 +# Configuration of poldek external file getters. Each [fetcher] section
546 +# declares one external downloader. The syntax is:
549 +# proto = PROTOCOL[ ,PROTOCOL... ]
550 +# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO
551 +# Possible parameters are:
554 +# Unique name of the fetcher. This is an optional parameter, if not set then
555 +# name is taken from the "cmd" parameter value as "$(basename $cmd)".
558 +# Protocol or protocols supported by fetcher. Name of the protocol can be
559 +# completely arbitrary, i.e. if you can handle protocol "foo" by writing
560 +# a script which takes URLs in form 'foo://'.
563 +# Parameter specifies an external command and its invoking syntax.
564 +# The syntax of "cmd" is:
565 +# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n]
566 +# Where COMMAND is the name or full path of command, OPTION is command specific
567 +# options. Macro '%d' is replaced with cache directory, '%D' is replaced with
568 +# 'cache directory/file basename', and '%p' with file basename, %P with file full
569 +# path (URL). Optional suffix 'n' with %p and %P means that command can be
570 +# invoked with multiple files at once.
571 +#cmd = foogetter.sh -N %D %Pn
573 +##Configured fetchers
576 +cmd = vfjuggle %d %Pn
579 +proto = http,ftp,https
580 +cmd = wget -N --dot-style=binary -P %d %Pn
592 +cmd = rsync -v %P %d
596 +cmd = vfsmb -v %P %d
600 +#cmd = vfssh.sh %d %Pn
604 +#cmd = foo.sh %d %Pn
607 diff -urN util-vserver-0.30.214.org/distrib/pld-th/poldek/pld-source.conf util-vserver-0.30.214/distrib/pld-th/poldek/pld-source.conf
608 --- util-vserver-0.30.214.org/distrib/pld-th/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100
609 +++ util-vserver-0.30.214/distrib/pld-th/poldek/pld-source.conf 2007-11-15 23:20:48.181172125 +0100
611 +# PLD <http://www.pld-linux.org/>
614 +_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th
616 +## You can use them if you have better connection there
618 +#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/th
625 +type = %{_th_idxtype}
627 +path = %{_pld_prefix}/PLD/%{_pld_arch}/RPMS/
630 +type = %{_th_idxtype}
632 +path = %{_pld_prefix}/PLD/noarch/RPMS/
635 +type = %{_th_idxtype}
636 +name = th-updates-security
637 +path = %{_pld_prefix}/updates-security/%{_pld_arch}/RPMS/
640 +type = %{_th_idxtype}
641 +name = th-updates-general
642 +path = %{_pld_prefix}/updates-general/%{_pld_arch}/RPMS/
646 +#type = %{_th_idxtype}
647 +#name = th-supported
648 +#path = %{_pld_prefix}/supported/%{_pld_arch}/RPMS/
652 +type = %{_th_idxtype}
654 +path = %{_pld_prefix}/ready/%{_pld_arch}/RPMS/
658 +type = %{_th_idxtype}
660 +path = %{_pld_prefix}/test/%{_pld_arch}/RPMS/
662 diff -urN util-vserver-0.30.214.org/distrib/pld-th/poldek/poldek.conf util-vserver-0.30.214/distrib/pld-th/poldek/poldek.conf
663 --- util-vserver-0.30.214.org/distrib/pld-th/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100
664 +++ util-vserver-0.30.214/distrib/pld-th/poldek/poldek.conf 2007-11-15 23:20:48.184505622 +0100
666 +# poldek main configuration file.
668 +# Some macros. Macros are local, they are not visible in included files
669 +# and macros declared in them are not visible to includer.
670 +# Macros names starts with underscore '_'.
674 +# Both local and remote files may be included. Included files may not contain
675 +# [global] section, it will be ignored anyway.
676 +%include %{_distro}-source.conf
679 +%include source.conf
681 +# External downloaders configuration, not necessary in most cases, cause
682 +# to internal HTTP and FTP client.
683 +#%include fetch.conf
688 +# This parameter allows to configure the default repository index type.
689 +#default index type = pndir
691 +# Cache directory for downloaded files. NOTE: that parent directory of cachedir
693 +#cachedir = $HOME/.poldek-cache
695 +# Switch to ordinary user at startup when executed by root
698 +# Permits using root privileges for installation only. Automatically turned
699 +# on when poldek executed as ordinary user.
702 +# Load /etc/apt/sources.list.
703 +#load apt sources list = no
705 +# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2).
706 +# This option is a workaround for broken zlib linked into librpm; with enabled
707 +# 'auto zlib in rpm' poldek tries to detect such case and then enables external
708 +# *.gz handling automatically.
709 +#vfile external compress = no
711 +# Auto detection of zlib linked into librpm. See 'vfile external compress'
713 +#auto zlib in rpm = yes
715 +# Automatically download whole index if incremental update fails.
718 +# Do not save given paths into created indexes. This option may significantly
719 +# reduce index size. Example (notice missing starting '/'):
720 +# exclude path = usr/share/doc:usr/share/man:usr/src
723 +# Full path name to a PM (rpm for now) binary.
724 +#pm command = /bin/rpm
726 +# Full path name to sudo binary.
727 +#sudo command = /usr/bin/sudo
730 +### File downloaders configuration
732 +# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default
733 +# 'poldek@znienacka.net' is sent)
734 +#vfile ftp sysuser as anon passwd = no
736 +# File getters configuration parameter. By this option URL handlers may be configured.
737 +# To get file from HTTP and FTP servers poldek uses its internal client (what is
738 +# recommended), although it can be changedby this option. Others protocols handled
739 +# by external utilities can be configured also. The syntax is:
740 +# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME
742 +# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch]
743 +# sections (placed in fetch.conf in default configuration).
745 +# default fetcher = ftp,http:internal
746 +# default fetcher = https:wget
747 +# default fetcher = cdrom:vfjuggle
748 +# vfjuggle is a cdrom getter supplied with poldek.
749 +#default fetcher = http,ftp: internal
751 +# Proxies for internal FTP and HTTP client may be configured in usual
752 +# way, by environment variables ftp_proxy and http_proxy, or by this option.
753 +# Its syntax is similar to "default fetcher" one:
754 +# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL
756 +# proxy = http: http://w3cache.foo.org:8080
759 +# Comma separated list of hosts or domains which will not be accessed via proxy.
760 +# Option overrides no_proxy environment variable.
762 +# noproxy = localhost, .pl, ftp.foo.bar.org
765 +# Internal HTTP and FTP client is stubborn, it retries to retrive
766 +# file if connection breaks. This option tells it how many times
768 +#vfile retries = 128
771 +### Installation options
773 +# Install packages in small groups instead of doing all-or-nothing
775 +particle install = no
777 +# Do not remove downloaded packages after its successful installation.
778 +#keep downloads = no
780 +# Controls visibility of multiple package instances with different EVR.
781 +# If on, only one, highest version will be visible.
782 +#unique package names = no
784 +# Epoch autopromotion during dependency comparision. RPM specific.
785 +# Set it up if you are using system with rpm prior to 4.2.1 version.
788 +# Confirm packages installation.
789 +#confirm installation = no
791 +# Confirm packages removal.
792 +#confirm removal = yes
794 +# Let the user select package among equivalents.
795 +choose equivalents manually = yes
797 +# Prevent package listed from being upgraded if they are already installed.
798 +# hold = kernel* dev
801 +# Ignore package list - packages fits given mask will be invisible.
802 +# ignore = *-smp-* foo*
803 +ignore = kernel* udev devfs
805 +# Conflicts with already installed packages are treated as resolved
806 +# if at least one of multiple-installed package satisfies conflict.
807 +# rpm doesn't support such cases, so --pm-nodeps is needed (use with
809 +#allow duplicates = yes
812 +### RPM specific options
814 +# rpm macros can be set by this option. Examples:
815 +# rpmdef = _install_langs pl:pl_PL:lt:lt_LT
816 +# Do not install any documentation:
817 +# rpmdef = _netsharedpath /usr/share/info:/usr/share/man
818 +# rpmdef = _excludedocs 1
822 +### Dependency processing settings
823 +# Subtle dependency processing options, they should not be changed
824 +# unless you know what you are doing
826 +# Automatically install packages required by installed ones.
829 +# Greedy upgrades, i.e. upgrade packages which dependencies are broken
830 +# by being uninstalled ones.
833 +# Be yet more greedy; if successor of orphaned package found, and this
834 +# successor drags no packages then upgrade the package instead of process
835 +# its dependencies. Option value is implied by 'greedy' one by defalut.
836 +#aggressive greedy = yes
838 +# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g.
839 +# package A requires capability foo >= 1.0 while package B provides "foo"
840 +# without any version. Use with care, it may cause weird dependency errors.
843 +# Taking into account package Obsoletes.
846 +# Taking into account package Conflicts.
848 diff -urN util-vserver-0.30.214.org/distrib/pld-th/poldek/source.conf util-vserver-0.30.214/distrib/pld-th/poldek/source.conf
849 --- util-vserver-0.30.214.org/distrib/pld-th/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100
850 +++ util-vserver-0.30.214/distrib/pld-th/poldek/source.conf 2007-11-15 23:20:48.184505622 +0100
852 +# Sample poldek sources configuration
853 +# Every source is configured in his own [source] section.
854 +# Possible parameters are:
857 +# Unique name of the repository.
860 +# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum'
861 +# and 'dir' as listed by --stl switch.
864 +# This parameter sets index original type i.e type of repository
865 +# from what this repository is created. Default is 'dir' - means
866 +# that directory of packages is scanned.
867 +#original type = dir
869 +# Unique name of the repository. May be either path or URL.
870 +#path = /some/url/or/dir
872 +# If package index and packages are stored in different locations then
873 +# prefix stands for packages path.
874 +#prefix = /some/url/or/dir
876 +# Controls visibility of multiple package instances with different EVR.
877 +# If on, only one, highest version will be visible.
880 +# Repository priority. If the same packages (equal names and EVR)
881 +# are available in more than one source then package from highest
882 +# prioritized source are taken. Priority is numeric value. Lower number
883 +# means higher priority, and negative priorities are allowed.
884 +# Priority is numeric value.
887 +# Controling if repository index will be implicit loaded. Set it off if
888 +# the index should be loaded on demand only, i.e. if specified directly
892 +# Controls if repository index will be implicit updated. Set it off if
893 +# the index should be updated on demand only, i.e. if specified directly
897 +# Packages PGP/GPG signatures (if any) will be verified before their
901 +# Have the same meaning as [global] parameter. Example:
902 +# hold = kernel* dev
905 +# Have the same meaning as [global] parameter. Example:
906 +# ignore = kernel*smp* dev
909 +# Parameter have the same meaning as [global] parameter.
910 +# exclude path = usr/share/doc:usr/share/man:usr/src
913 +# Preferred language of package descriptions. If not set, taken from locale
914 +# settings. Example:
915 +# lang = pl_PL:lt_LT
921 +path = $HOME/rpm/RPMS
928 +#path = ftp://ftp.foo.bar.org/RPMS/
934 +#ignore = kernel*-smp-*
937 diff -urN util-vserver-0.30.214.org/distrib/pld-th/rpm/macros util-vserver-0.30.214/distrib/pld-th/rpm/macros
938 --- util-vserver-0.30.214.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100
939 +++ util-vserver-0.30.214/distrib/pld-th/rpm/macros 2007-11-15 23:20:48.184505622 +0100
941 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
942 +# you have to use at least one language beside 'C'
943 +%_install_langs C:en:pl
944 +%_netsharedpath /dev
945 diff -urN util-vserver-0.30.214.org/distrib/pld-th/rpmlist.d/00.lst util-vserver-0.30.214/distrib/pld-th/rpmlist.d/00.lst
946 --- util-vserver-0.30.214.org/distrib/pld-th/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100
947 +++ util-vserver-0.30.214/distrib/pld-th/rpmlist.d/00.lst 2007-11-15 23:20:48.184505622 +0100
958 +vserver-packages-*.rpm
959 diff -urN util-vserver-0.30.214.org/distrib/pld-ti/pkgs/01 util-vserver-0.30.214/distrib/pld-ti/pkgs/01
960 --- util-vserver-0.30.214.org/distrib/pld-ti/pkgs/01 1970-01-01 01:00:00.000000000 +0100
961 +++ util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2007-11-15 23:20:48.217840583 +0100
968 diff -urN util-vserver-0.30.214.org/distrib/pld-ti/poldek/aliases.conf util-vserver-0.30.214/distrib/pld-ti/poldek/aliases.conf
969 --- util-vserver-0.30.214.org/distrib/pld-ti/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100
970 +++ util-vserver-0.30.214/distrib/pld-ti/poldek/aliases.conf 2007-11-15 23:20:48.217840583 +0100
972 +# System wide aliases
980 +freshen = install -FN
981 +upgrade = install -F
983 +# for backward compatybility, greedy is on by default now
984 +greedy-upgrade = install -FG
986 +just-install = install -IN
989 +what-requires = search -r
990 +what-provides = search -p
991 +rsearch = search --perlre
996 +#ls = uninstall kernel
1002 diff -urN util-vserver-0.30.214.org/distrib/pld-ti/poldek/fetch.conf util-vserver-0.30.214/distrib/pld-ti/poldek/fetch.conf
1003 --- util-vserver-0.30.214.org/distrib/pld-ti/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100
1004 +++ util-vserver-0.30.214/distrib/pld-ti/poldek/fetch.conf 2007-11-15 23:20:48.217840583 +0100
1006 +# Configuration of poldek external file getters. Each [fetcher] section
1007 +# declares one external downloader. The syntax is:
1010 +# proto = PROTOCOL[ ,PROTOCOL... ]
1011 +# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO
1012 +# Possible parameters are:
1015 +# Unique name of the fetcher. This is an optional parameter, if not set then
1016 +# name is taken from the "cmd" parameter value as "$(basename $cmd)".
1019 +# Protocol or protocols supported by fetcher. Name of the protocol can be
1020 +# completely arbitrary, i.e. if you can handle protocol "foo" by writing
1021 +# a script which takes URLs in form 'foo://'.
1024 +# Parameter specifies an external command and its invoking syntax.
1025 +# The syntax of "cmd" is:
1026 +# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n]
1027 +# Where COMMAND is the name or full path of command, OPTION is command specific
1028 +# options. Macro '%d' is replaced with cache directory, '%D' is replaced with
1029 +# 'cache directory/file basename', and '%p' with file basename, %P with file full
1030 +# path (URL). Optional suffix 'n' with %p and %P means that command can be
1031 +# invoked with multiple files at once.
1032 +#cmd = foogetter.sh -N %D %Pn
1034 +##Configured fetchers
1037 +cmd = vfjuggle %d %Pn
1040 +proto = http,ftp,https
1041 +cmd = wget -N --dot-style=binary -P %d %Pn
1049 +cmd = curl %P -o %D
1053 +cmd = rsync -v %P %d
1057 +cmd = vfsmb -v %P %d
1061 +#cmd = vfssh.sh %d %Pn
1065 +#cmd = foo.sh %d %Pn
1068 diff -urN util-vserver-0.30.214.org/distrib/pld-ti/poldek/pld-source.conf util-vserver-0.30.214/distrib/pld-ti/poldek/pld-source.conf
1069 --- util-vserver-0.30.214.org/distrib/pld-ti/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100
1070 +++ util-vserver-0.30.214/distrib/pld-ti/poldek/pld-source.conf 2007-11-15 23:20:48.217840583 +0100
1073 +# Unofficial version of PLD Linux Distribution
1074 +# http://www.pld-linux.org/Titanium
1077 +_prefix = ftp://ftp.titanium.pld-linux.org/branches/titanium
1084 +path = %{_prefix}/PLD/%{_arch}/RPMS/
1089 +path = %{_prefix}/PLD/noarch/RPMS/
1093 +name = titanium-ready
1094 +path = %{_prefix}/ready/%{_arch}/RPMS/
1100 +name = titanium-ready
1101 +path = %{_prefix}/ready/noarch/RPMS/
1107 +name = titanium-test
1108 +path = %{_prefix}/test/%{_arch}/RPMS/
1114 +name = titanium-test
1115 +path = %{_prefix}/test/noarch/RPMS/
1118 diff -urN util-vserver-0.30.214.org/distrib/pld-ti/poldek/poldek.conf util-vserver-0.30.214/distrib/pld-ti/poldek/poldek.conf
1119 --- util-vserver-0.30.214.org/distrib/pld-ti/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100
1120 +++ util-vserver-0.30.214/distrib/pld-ti/poldek/poldek.conf 2007-11-15 23:20:48.217840583 +0100
1122 +# poldek main configuration file.
1124 +# Some macros. Macros are local, they are not visible in included files
1125 +# and macros declared in them are not visible to includer.
1126 +# Macros names starts with underscore '_'.
1130 +# Both local and remote files may be included. Included files may not contain
1131 +# [global] section, it will be ignored anyway.
1132 +%include %{_distro}-source.conf
1135 +%include source.conf
1137 +# External downloaders configuration, not necessary in most cases, cause
1138 +# to internal HTTP and FTP client.
1139 +#%include fetch.conf
1144 +# This parameter allows to configure the default repository index type.
1145 +#default index type = pndir
1147 +# Cache directory for downloaded files. NOTE: that parent directory of cachedir
1149 +#cachedir = $HOME/.poldek-cache
1151 +# Switch to ordinary user at startup when executed by root
1154 +# Permits using root privileges for installation only. Automatically turned
1155 +# on when poldek executed as ordinary user.
1158 +# Load /etc/apt/sources.list.
1159 +#load apt sources list = no
1161 +# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2).
1162 +# This option is a workaround for broken zlib linked into librpm; with enabled
1163 +# 'auto zlib in rpm' poldek tries to detect such case and then enables external
1164 +# *.gz handling automatically.
1165 +#vfile external compress = no
1167 +# Auto detection of zlib linked into librpm. See 'vfile external compress'
1169 +#auto zlib in rpm = yes
1171 +# Automatically download whole index if incremental update fails.
1174 +# Do not save given paths into created indexes. This option may significantly
1175 +# reduce index size. Example (notice missing starting '/'):
1176 +# exclude path = usr/share/doc:usr/share/man:usr/src
1179 +# Full path name to a PM (rpm for now) binary.
1180 +#pm command = /bin/rpm
1182 +# Full path name to sudo binary.
1183 +#sudo command = /usr/bin/sudo
1186 +### File downloaders configuration
1188 +# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default
1189 +# 'poldek@znienacka.net' is sent)
1190 +#vfile ftp sysuser as anon passwd = no
1192 +# File getters configuration parameter. By this option URL handlers may be configured.
1193 +# To get file from HTTP and FTP servers poldek uses its internal client (what is
1194 +# recommended), although it can be changedby this option. Others protocols handled
1195 +# by external utilities can be configured also. The syntax is:
1196 +# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME
1198 +# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch]
1199 +# sections (placed in fetch.conf in default configuration).
1201 +# default fetcher = ftp,http:internal
1202 +# default fetcher = https:wget
1203 +# default fetcher = cdrom:vfjuggle
1204 +# vfjuggle is a cdrom getter supplied with poldek.
1205 +#default fetcher = http,ftp: internal
1207 +# Proxies for internal FTP and HTTP client may be configured in usual
1208 +# way, by environment variables ftp_proxy and http_proxy, or by this option.
1209 +# Its syntax is similar to "default fetcher" one:
1210 +# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL
1212 +# proxy = http: http://w3cache.foo.org:8080
1215 +# Comma separated list of hosts or domains which will not be accessed via proxy.
1216 +# Option overrides no_proxy environment variable.
1218 +# noproxy = localhost, .pl, ftp.foo.bar.org
1221 +# Internal HTTP and FTP client is stubborn, it retries to retrive
1222 +# file if connection breaks. This option tells it how many times
1224 +#vfile retries = 128
1227 +### Installation options
1229 +# Install packages in small groups instead of doing all-or-nothing
1231 +particle install = no
1233 +# Do not remove downloaded packages after its successful installation.
1234 +#keep downloads = no
1236 +# Controls visibility of multiple package instances with different EVR.
1237 +# If on, only one, highest version will be visible.
1238 +#unique package names = no
1240 +# Epoch autopromotion during dependency comparision. RPM specific.
1241 +# Set it up if you are using system with rpm prior to 4.2.1 version.
1244 +# Confirm packages installation.
1245 +#confirm installation = no
1247 +# Confirm packages removal.
1248 +#confirm removal = yes
1250 +# Let the user select package among equivalents.
1251 +choose equivalents manually = yes
1253 +# Prevent package listed from being upgraded if they are already installed.
1254 +# hold = kernel* dev
1257 +# Ignore package list - packages fits given mask will be invisible.
1258 +# ignore = *-smp-* foo*
1259 +ignore = kernel* udev devfs
1261 +# Conflicts with already installed packages are treated as resolved
1262 +# if at least one of multiple-installed package satisfies conflict.
1263 +# rpm doesn't support such cases, so --pm-nodeps is needed (use with
1265 +#allow duplicates = yes
1268 +### RPM specific options
1270 +# rpm macros can be set by this option. Examples:
1271 +# rpmdef = _install_langs pl:pl_PL:lt:lt_LT
1272 +# Do not install any documentation:
1273 +# rpmdef = _netsharedpath /usr/share/info:/usr/share/man
1274 +# rpmdef = _excludedocs 1
1278 +### Dependency processing settings
1279 +# Subtle dependency processing options, they should not be changed
1280 +# unless you know what you are doing
1282 +# Automatically install packages required by installed ones.
1285 +# Greedy upgrades, i.e. upgrade packages which dependencies are broken
1286 +# by being uninstalled ones.
1289 +# Be yet more greedy; if successor of orphaned package found, and this
1290 +# successor drags no packages then upgrade the package instead of process
1291 +# its dependencies. Option value is implied by 'greedy' one by defalut.
1292 +#aggressive greedy = yes
1294 +# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g.
1295 +# package A requires capability foo >= 1.0 while package B provides "foo"
1296 +# without any version. Use with care, it may cause weird dependency errors.
1299 +# Taking into account package Obsoletes.
1302 +# Taking into account package Conflicts.
1304 diff -urN util-vserver-0.30.214.org/distrib/pld-ti/poldek/source.conf util-vserver-0.30.214/distrib/pld-ti/poldek/source.conf
1305 --- util-vserver-0.30.214.org/distrib/pld-ti/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100
1306 +++ util-vserver-0.30.214/distrib/pld-ti/poldek/source.conf 2007-11-15 23:20:48.217840583 +0100
1308 +# Sample poldek sources configuration
1309 +# Every source is configured in his own [source] section.
1310 +# Possible parameters are:
1313 +# Unique name of the repository.
1316 +# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum'
1317 +# and 'dir' as listed by --stl switch.
1320 +# This parameter sets index original type i.e type of repository
1321 +# from what this repository is created. Default is 'dir' - means
1322 +# that directory of packages is scanned.
1323 +#original type = dir
1325 +# Unique name of the repository. May be either path or URL.
1326 +#path = /some/url/or/dir
1328 +# If package index and packages are stored in different locations then
1329 +# prefix stands for packages path.
1330 +#prefix = /some/url/or/dir
1332 +# Controls visibility of multiple package instances with different EVR.
1333 +# If on, only one, highest version will be visible.
1336 +# Repository priority. If the same packages (equal names and EVR)
1337 +# are available in more than one source then package from highest
1338 +# prioritized source are taken. Priority is numeric value. Lower number
1339 +# means higher priority, and negative priorities are allowed.
1340 +# Priority is numeric value.
1343 +# Controling if repository index will be implicit loaded. Set it off if
1344 +# the index should be loaded on demand only, i.e. if specified directly
1348 +# Controls if repository index will be implicit updated. Set it off if
1349 +# the index should be updated on demand only, i.e. if specified directly
1353 +# Packages PGP/GPG signatures (if any) will be verified before their
1357 +# Have the same meaning as [global] parameter. Example:
1358 +# hold = kernel* dev
1361 +# Have the same meaning as [global] parameter. Example:
1362 +# ignore = kernel*smp* dev
1365 +# Parameter have the same meaning as [global] parameter.
1366 +# exclude path = usr/share/doc:usr/share/man:usr/src
1369 +# Preferred language of package descriptions. If not set, taken from locale
1370 +# settings. Example:
1371 +# lang = pl_PL:lt_LT
1377 +path = $HOME/rpm/RPMS
1384 +#path = ftp://ftp.foo.bar.org/RPMS/
1390 +#ignore = kernel*-smp-*
1393 diff -urN util-vserver-0.30.214.org/distrib/pld-ti/rpm/macros util-vserver-0.30.214/distrib/pld-ti/rpm/macros
1394 --- util-vserver-0.30.214.org/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100
1395 +++ util-vserver-0.30.214/distrib/pld-ti/rpm/macros 2007-11-15 23:20:48.221174080 +0100
1397 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
1398 +# you have to use at least one language beside 'C'
1399 +%_install_langs C:en:pl
1400 +%_netsharedpath /dev
1401 diff -urN util-vserver-0.30.214.org/distrib/pld-ti/rpmlist.d/00.lst util-vserver-0.30.214/distrib/pld-ti/rpmlist.d/00.lst
1402 --- util-vserver-0.30.214.org/distrib/pld-ti/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100
1403 +++ util-vserver-0.30.214/distrib/pld-ti/rpmlist.d/00.lst 2007-11-15 23:20:48.221174080 +0100
1414 +vserver-packages-*.rpm
1415 diff -urN util-vserver-0.30.214.org/scripts/functions util-vserver-0.30.214/scripts/functions
1416 --- util-vserver-0.30.214.org/scripts/functions 2007-09-02 22:06:41.000000000 +0200
1417 +++ util-vserver-0.30.214/scripts/functions 2007-11-15 23:20:48.221174080 +0100
1418 @@ -403,6 +403,20 @@
1422 +function _pkgSetVarsPoldek
1424 + if test -n "$PKGDIR"; then
1425 + findDir POLDEKETCDIR $PKGDIR/poldeketc $PKGDIR/base/poldek/etc /etc/poldek
1426 + findDir POLDEKCACHEDIR $PKGDIR/poldek-cache $PKGDIR/base/poldek/cache
1428 + findDir POLDEKETCDIR "$VDIR"/etc/poldek /etc/poldek
1429 + findDir POLDEKCACHEDIR "$VDIR"/var/tmp/poldek-cache
1432 + findFile POLDEK_CONFIG "$POLDEKETCDIR"/poldek.conf ""
1433 + test -z "$POLDEK_CONFIG" || export POLDEK_CONFIG
1437 function _pkgMountBase
1440 rpm) _pkgSetVarsRPM;;
1441 apt) _pkgSetVarsApt;;
1442 yum) _pkgSetVarsYum;;
1443 + poldek) _pkgSetVarsPoldek;;
1444 *) echo "Unknown packaging flavor" >&2; exit 1;;
1449 elif test -e "$_pgs_vdir"/etc/mandrake-release; then
1451 + elif test -e "$_pgs_vdir"/etc/pld-release; then
1453 elif test -e "$_pgs_vdir"/etc/debian_version; then
1455 elif test -e "$_pgs_vdir"/etc/SuSE-release; then
1456 @@ -831,6 +848,27 @@
1457 test -n "$have_yum" && return 0 || return 1
1460 +## Usage: pkgmgmt.isPoldekAvailable <cfgdir> <vdir> [<is-internal>]
1461 +function pkgmgmt.isPoldekAvailable
1465 + local is_internal="$3"
1467 + local have_poldek i
1468 + if test -n "$is_internal"; then
1470 + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
1473 + for i in /bin /usr/bin /usr/local/bin; do
1474 + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
1478 + test -n "$have_poldek" && return 0 || return 1
1482 function vshelper.doSanityCheck
1484 diff -urN util-vserver-0.30.214.org/scripts/Makefile-files util-vserver-0.30.214/scripts/Makefile-files
1485 --- util-vserver-0.30.214.org/scripts/Makefile-files 2007-09-02 22:06:41.000000000 +0200
1486 +++ util-vserver-0.30.214/scripts/Makefile-files 2007-11-15 23:20:48.221174080 +0100
1488 scripts/vapt-get-worker \
1489 scripts/vrpm-worker \
1490 scripts/vyum-worker \
1491 + scripts/vpoldek-worker \
1492 scripts/vrpm-preload \
1493 scripts/save_s_context \
1494 scripts/vservers.grabinfo.sh \
1496 scripts/vserver-build.template \
1497 scripts/vserver-build.rsync \
1498 scripts/vserver-build.clone \
1499 + scripts/vserver-build.poldek \
1500 scripts/vserver-build.functions \
1501 scripts/vserver-build.functions.apt \
1502 scripts/vserver-build.functions.rpm \
1503 scripts/vserver-build.functions.pkgmgmt \
1504 scripts/vserver-build.functions.yum \
1505 + scripts/vserver-build.functions.poldek \
1506 scripts/vserver-setup.functions \
1507 scripts/vserver.functions \
1508 scripts/vserver.start \
1510 scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \
1511 scripts/vapt-get-worker \
1513 + scripts/vpoldek-worker \
1514 scripts/vrpm-worker \
1515 scripts/vrpm-preload \
1516 scripts/start-vservers \
1518 scripts_sbin_src_PRGS = scripts/chbind \
1522 scripts/vdispatch-conf \
1525 diff -urN util-vserver-0.30.214.org/scripts/pkgmgmt util-vserver-0.30.214/scripts/pkgmgmt
1526 --- util-vserver-0.30.214.org/scripts/pkgmgmt 2007-09-02 22:06:41.000000000 +0200
1527 +++ util-vserver-0.30.214/scripts/pkgmgmt 2007-11-15 23:20:48.221174080 +0100
1532 - (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}")
1533 + (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}")
1534 hasSubstring "$pkgs" ---rpm--- || {
1536 * The vserver does not seem to have the 'rpm' package which is required
1541 - hasSubstring "$pkgs" ---apt--- ---yum--- || {
1542 + hasSubstring "$pkgs" ---apt--- ---yum--- ---poldek--- || {
1544 -* The vserver does not seem to have a depsolver like 'apt' or 'yum'
1545 +* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek'
1546 installed. It is suggested to install such a program before setting
1547 up internal package management."
1549 @@ -368,6 +368,131 @@
1553 +function processVserver_PLD()
1556 + local is_internalize=$2
1560 + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR pkgmgmt) || \
1561 + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR)/pkgmgmt
1563 + ## Figure out the environment....
1564 + pkgmgmt.isPoldekAvailable "$cfgdir" "$vdir" "$is_internalize" || have_poldek=
1566 + local POLDEKETCDIR=
1567 + local POLDEKCACHEDIR=
1569 + local RPMSTATEDIR=
1571 + ## Create directories and assign variables where configuration
1572 + ## can/will be found on the host
1573 + if test -n "$is_internalize"; then
1574 + verifyInternalPackages "$vserver" RH || test -n "$IS_FORCE" ||
1576 +Can not continue; use '--force' to override this check"
1578 + pushd "$vdir" >/dev/null
1580 + test ! -L var/lib/rpm || {
1581 + $_EXEC_CD /var/lib $_RM rpm &&
1582 + $_EXEC_CD /var/lib $_MKDIR -m755 rpm &&
1583 + $_EXEC_CD /var/lib $_CHOWN rpm:rpm rpm ||
1585 + } </dev/null 2>/dev/null
1587 + for i in var/tmp/poldek-cache etc/rpm etc/poldek; do
1589 + $_EXEC_CD /$(dirname "$i") $_MKDIR -m755 $(basename "$i") || :
1594 + if test -n "$have_poldek"; then
1595 + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /etc/poldek
1598 + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /etc/rpm /
1599 + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state
1601 + mkdir -m755 -p "$cfgdir"
1604 + if test -n "$have_poldek"; then
1605 + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /
1606 + findDir POLDEKCACHEDIR "$cfgdir"/poldek-cache "$cfgdir"/base/poldek/cache /
1608 + test "$POLDEKETCDIR" != / || POLDEKETCDIR=$cfgdir/base/poldek/etc
1609 + test "$POLDEKCACHEDIR" != / || POLDEKCACHEDIR=$cfgdir/base/poldek/cache
1611 + test -d "$cfgdir"/poldeketc -a -d "$cfgdir"/poldek-cache || need_base=1
1614 + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /
1615 + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state /
1617 + test "$RPMETCDIR" != / || RPMETCDIR=$cfgdir/base/rpm/etc
1618 + test "$RPMSTATEDIR" != / || RPMSTATEDIR=$cfgdir/base/rpm/state
1620 + test -d "$cfgdir"/rpmetc -a -d "$cfgdir"/rpmstate || need_base=1
1621 + test ! -e "$cfgdir"/base || need_base=
1623 + test -z "$need_base" || ln -s "$PKGCFGDIR" "$cfgdir"/base
1625 + mkdir -m755 -p "$PKGCFGDIR"
1626 + _createDirs "$POLDEKETCDIR" "$POLDEKCACHEDIR" \
1627 + "$RPMETCDIR" "$RPMSTATEDIR"
1630 + ## Copy the files...
1631 + if test -n "$is_internalize"; then
1632 + if test -n "$have_poldek"; then
1633 + _copySecure "$vdir" "$POLDEKETCDIR" /etc/poldek
1634 + pushd "$vdir" >/dev/null
1635 + _hashAuto /etc/poldek.conf '/'
1639 + _copySecure "$vdir" "$RPMETCDIR" /etc/rpm
1640 + _copySecure "$vdir" "$RPMSTATEDIR" /var/lib/rpm
1642 + pushd "$vdir" >/dev/null
1643 + ## remove %_dbpath settings
1644 + _substFile /etc/rpm/macros '/^%_dbpath[ \t].*/D'
1647 + if test -n "$have_poldek"; then
1648 + _copySecureRev "$vdir" /etc/poldek "$POLDEKETCDIR"
1649 + _unhashAuto "$POLDEKETCDIR"/poldek.conf '/'
1652 + _copySecureRev "$vdir" /etc/rpm "$RPMETCDIR"
1653 + _copySecureRev "$vdir" /var/lib/rpm "$RPMSTATEDIR"
1655 + echo -e "%_dbpath\t\t$rpmdb_mntpoint" >>$RPMETCDIR/macros
1659 + if test -n "$is_internalize"; then
1662 + tmpdir=$($_MKTEMPDIR -p /var/tmp pgmgmt.XXXXXX)
1663 + trap "$_RM -rf $tmpdir" EXIT
1664 + pushd "$vdir" >/dev/null
1665 + $_EXEC_CD /var/lib $_MV rpm $tmpdir/
1666 + $_EXEC_CD /var/lib $_LN_S "$rpmdb_mntpoint" rpm
1671 + if test -n "$is_internalize"; then
1672 + $_TOUCH "$cfgdir"/internal
1674 + $_RM -f "$cfgdir"/internal
1678 function processVserver_Debian()
1684 (redhat|mandrake) processVserver_RH "$vserver" "$IS_INTERNALIZE";;
1685 + (pld) processVserver_PLD "$vserver" "$IS_INTERNALIZE";;
1686 (debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";;
1688 echo $"Vserver style '$style' is not supported for packagemanagment" >&2
1689 diff -urN util-vserver-0.30.214.org/scripts/util-vserver-vars.pathsubst util-vserver-0.30.214/scripts/util-vserver-vars.pathsubst
1690 --- util-vserver-0.30.214.org/scripts/util-vserver-vars.pathsubst 2007-09-02 22:06:41.000000000 +0200
1691 +++ util-vserver-0.30.214/scripts/util-vserver-vars.pathsubst 2007-11-15 23:20:48.221174080 +0100
1693 _LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKGLIBDIR/vserver-build.functions.rpm"
1694 _LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGLIBDIR/vserver-build.functions.yum"
1695 _LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGLIBDIR/vserver-build.functions.pkgmgmt"
1696 +_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK="$__PKGLIBDIR/vserver-build.functions.poldek"
1697 _LISTDEVIP="$__LEGACYDIR/listdevip"
1698 _LOCKFILE="$__PKGLIBDIR/lockfile"
1699 _MASK2PREFIX="$__PKGLIBDIR/mask2prefix"
1701 _VUNIFY="$__PKGLIBDIR/vunify"
1702 _VYUM="$__SBINDIR/vyum"
1703 _VYUM_WORKER="$__PKGLIBDIR/vyum-worker"
1704 +_VPOLDEK="$__SBINDIR/vpoldek"
1705 +_VPOLDEK_WORKER="$__PKGLIBDIR/vpoldek-worker"
1709 diff -urN util-vserver-0.30.214.org/scripts/vpkg util-vserver-0.30.214/scripts/vpkg
1710 --- util-vserver-0.30.214.org/scripts/vpkg 2007-09-02 22:06:41.000000000 +0200
1711 +++ util-vserver-0.30.214/scripts/vpkg 2007-11-15 23:20:48.221174080 +0100
1712 @@ -115,6 +115,44 @@
1720 + ## rpm outputs sometimes '(contains no files)', so return
1721 + ## only the valid output
1723 + rpm_param=( -qac --pipe "$_SED '\!^/!p;d'" );;
1725 + rpm_param=( -Uvh "$@" )
1726 + poldek_param=( --install -v "$@" )
1730 + if test -n "$is_external"; then
1732 + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
1735 + for i in /bin /usr/bin /usr/local/bin; do
1736 + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
1740 + if test -n "$is_external"; then
1741 + if test "$have_poldek" -a "$poldek_param"; then
1742 + cmd=( "$_VPOLDEK" "$vserver" -- "${poldek_param[@]}" )
1744 + cmd=( "$_VRPM" "$vserver" -- "${rpm_param[@]}" )
1747 + if test "$have_poldek" -a "$poldek_param"; then
1748 + cmd=( "$_VSERVER" --silent "$vserver" exec poldek "${poldek_param[@]}" )
1750 + cmd=( "$_VSERVER" --silent "$vserver" exec rpm "${rpm_param[@]}" )
1757 diff -urN util-vserver-0.30.214.org/scripts/vpoldek util-vserver-0.30.214/scripts/vpoldek
1758 --- util-vserver-0.30.214.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100
1759 +++ util-vserver-0.30.214/scripts/vpoldek 2007-11-15 22:00:24.000000000 +0100
1764 +# Copyright (C) 2007 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1766 +# This program is free software; you can redistribute it and/or modify
1767 +# it under the terms of the GNU General Public License as published by
1768 +# the Free Software Foundation; version 2 of the License.
1770 +# This program is distributed in the hope that it will be useful,
1771 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1772 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1773 +# GNU General Public License for more details.
1775 +# You should have received a copy of the GNU General Public License
1776 +# along with this program; if not, write to the Free Software
1777 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1779 +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
1780 +test -e "$UTIL_VSERVER_VARS" || {
1781 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
1784 +. "$UTIL_VSERVER_VARS"
1785 +. "$_LIB_FUNCTIONS"
1788 +function showHelp()
1791 +$"Usage: $0 <vserver-name>* [--all] -- <params>+
1793 +Report bugs to <$PACKAGE_BUGREPORT>."
1797 +function showVersion()
1800 +$"vpoldek $PACKAGE_VERSION -- poldek for vservers
1801 +This program is part of $PACKAGE_STRING
1803 +Copyright (C) 2007 Enrico Scholz
1804 +This program is free software; you may redistribute it under the terms of
1805 +the GNU General Public License. This program has absolutely no warranty."
1809 +tmp=$(getopt -o +q --long help,version,debug,quiet,all -n "$0" -- "$@") || exit 1
1812 +declare -a send_through poldek_opts
1816 + (--help) showHelp $0 ;;
1817 + (--version) showVersion ;;
1818 + (--debug) send_through=( "${send_through[@]}" "$1" ); set -x;;
1819 + (--quiet|-q) send_through=( "${send_through[@]}" "$1" );;
1820 + (--all) poldek_opts=( "${poldek_opts[@]}" "$1" );;
1821 + (--) shift; break;;
1822 + (*) echo $"vpoldek: internal error; arg=='$1'" >&2; exit 1;;
1827 +VSOMETHING_TITLE=vpoldek
1828 +VSOMETHING_WORKER=$_VPOLDEK_WORKER
1829 +VSOMETHING_PKGMGMT=1
1831 +export VSOMETHING_TITLE VSOMETHING_WORKER VSOMETHING_PKGMGMT
1833 +test ${#poldek_opts[@]} -eq 0 || poldek_opts=( "${poldek_opts[@]}" -- )
1834 +exec $_VSOMETHING "${send_through[@]}" poldek "${poldek_opts[@]}" "$@"
1835 diff -urN util-vserver-0.30.214.org/scripts/vpoldek-worker util-vserver-0.30.214/scripts/vpoldek-worker
1836 --- util-vserver-0.30.214.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100
1837 +++ util-vserver-0.30.214/scripts/vpoldek-worker 2007-11-15 22:58:23.000000000 +0100
1842 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1844 +# This program is free software; you can redistribute it and/or modify
1845 +# it under the terms of the GNU General Public License as published by
1846 +# the Free Software Foundation; version 2 of the License.
1848 +# This program is distributed in the hope that it will be useful,
1849 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1850 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1851 +# GNU General Public License for more details.
1853 +# You should have received a copy of the GNU General Public License
1854 +# along with this program; if not, write to the Free Software
1855 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1859 +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
1860 +test -e "$UTIL_VSERVER_VARS" || {
1861 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
1864 +. "$UTIL_VSERVER_VARS"
1865 +. "$_LIB_FUNCTIONS"
1871 +pkgInit "$vserver" rpm poldek
1873 +test -z "$_POLDEK" || {
1874 + warning $"The environment variable \$_POLDEK is not supported anymore; please use \$POLDEK instead of"
1875 + ${POLDEK:=$_POLDEK}
1878 +exec ${_POLDEK:-poldek} \
1880 + --cachedir=$POLDEKCACHEDIR \
1881 + --conf=$POLDEK_CONFIG \
1882 + --pmcmd=$RPM_BINARY \
1884 diff -urN util-vserver-0.30.214.org/scripts/vserver-build util-vserver-0.30.214/scripts/vserver-build
1885 --- util-vserver-0.30.214.org/scripts/vserver-build 2007-09-02 22:06:41.000000000 +0200
1886 +++ util-vserver-0.30.214/scripts/vserver-build 2007-11-15 23:20:48.224507577 +0100
1888 yum ... -- -d <distribution>
1889 ... installs the base-packages of the given distribution with
1891 + poldek ... -- -d <distribution>
1892 + ... installs the base-packages of the given distribution with
1894 rpm ... -- [-d <distribution>] --empty|([--force] [--nodeps] <manifest>)+
1895 ... installs lists of rpm-packages
1896 skeleton ... -- [<cmd> <args>*]
1900 (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
1901 - (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone)
1902 + (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xpoldek)
1903 . $__PKGLIBDIR/vserver-build.$method
1905 (x) panic $"No build-method specified";;
1906 diff -urN util-vserver-0.30.214.org/scripts/vserver-build.functions util-vserver-0.30.214/scripts/vserver-build.functions
1907 --- util-vserver-0.30.214.org/scripts/vserver-build.functions 2007-09-02 22:06:41.000000000 +0200
1908 +++ util-vserver-0.30.214/scripts/vserver-build.functions 2007-11-15 23:20:48.224507577 +0100
1909 @@ -167,6 +167,12 @@
1910 elif test -e /etc/slackware-version; then
1911 set -- $(cat /etc/slackware-version)
1912 DISTRIBUTION=slackware$2
1913 + elif test -e /etc/pld-release; then
1916 + set -- $(cat /etc/pld-release)
1917 + DISTRIBUTION=pld-$(echo $2 | tr A-Z a-z)
1919 elif test -n "$1"; then
1922 diff -urN util-vserver-0.30.214.org/scripts/vserver-build.functions.poldek util-vserver-0.30.214/scripts/vserver-build.functions.poldek
1923 --- util-vserver-0.30.214.org/scripts/vserver-build.functions.poldek 1970-01-01 01:00:00.000000000 +0100
1924 +++ util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2007-11-15 23:20:48.224507577 +0100
1926 +# $Id$ --*- sh -*--
1928 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1930 +# This program is free software; you can redistribute it and/or modify
1931 +# it under the terms of the GNU General Public License as published by
1932 +# the Free Software Foundation; version 2 of the License.
1934 +# This program is distributed in the hope that it will be useful,
1935 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1936 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1937 +# GNU General Public License for more details.
1939 +# You should have received a copy of the GNU General Public License
1940 +# along with this program; if not, write to the Free Software
1941 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1943 +function poldek.installBasePackages
1948 + test "$dir" != / || return 0
1949 + for filelist in "$dir"/*; do
1950 + isRegularFile "$filelist" || continue
1952 + local can_fail=false
1953 + local flags='--install'
1955 + set -- $(<$filelist)
1956 + while test "$#" -gt 0; do
1958 + --reinstall) flags='--reinstall';;
1959 + --can-fail) can_fail=true;;
1964 + "$_VPOLDEK" "$name" -- $flags $* || $can_fail
1968 +function poldek.initVariables
1970 + findFile POLDEKCONFDEFAULT \
1971 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek/poldek.conf" \
1972 + "$__CONFDIR/.defaults/apps/pkgmgmt/poldek/poldek.conf" \
1973 + "$__DISTRIBDIR/$DISTRIBUTION/poldek/poldek.conf" \
1974 + "$__DISTRIBDIR/defaults/poldek/poldek.conf" \
1978 +function poldek.initFilesystem
1980 + mkdir -p "$PKGCFGDIR"/poldek/etc
1981 + mkdir -p "$PKGCFGBASE"/poldek-cache
1983 + $_LN_S "$PKGCFGBASE"/poldek-cache "$PKGCFGDIR"/poldek/cache
1985 + populateDirectory "$PKGCFGDIR/poldek/etc" \
1986 + "$__DISTRIBDIR/defaults/poldek" \
1987 + "$__DISTRIBDIR/$DISTRIBUTION/poldek" \
1988 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek"
1990 +# test -z "$POLDEKCONFDEFAULT" || \
1991 +# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/
1993 diff -urN util-vserver-0.30.214.org/scripts/vserver-build.poldek util-vserver-0.30.214/scripts/vserver-build.poldek
1994 --- util-vserver-0.30.214.org/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100
1995 +++ util-vserver-0.30.214/scripts/vserver-build.poldek 2007-11-15 23:20:48.224507577 +0100
1997 +# $Id$ --*- sh -*--
1999 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
2001 +# This program is free software; you can redistribute it and/or modify
2002 +# it under the terms of the GNU General Public License as published by
2003 +# the Free Software Foundation; version 2 of the License.
2005 +# This program is distributed in the hope that it will be useful,
2006 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
2007 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2008 +# GNU General Public License for more details.
2010 +# You should have received a copy of the GNU General Public License
2011 +# along with this program; if not, write to the Free Software
2012 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
2014 +tmp=$(getopt -o +d: --long debug -n "$0" -- "$@") || exit 1
2017 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_RPM"
2018 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK"
2019 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT"
2023 + (-d) DISTRIBUTION=$2; shift;;
2024 + (--debug) set -x;;
2025 + (--) shift; break ;;
2026 + (*) echo "vserver-build.poldek: internal error: unrecognized option '$1'" >&2
2037 +pkgmgmt.initVariables
2039 +poldek.initVariables
2041 +base.initFilesystem "$OPTION_FORCE"
2042 +pkgmgmt.initFilesystem "$OPTION_FORCE"
2044 +poldek.initFilesystem
2046 +setup_writeOption "$VSERVER_NAME"
2047 +setup_writeInitialFstab
2049 +test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
2050 +rpm.initDB "$SETUP_CONFDIR"
2051 +rpm.importGPGPubKeys "$SETUP_CONFDIR" \
2052 + "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \
2053 + "$__CONFDIR/.distributions/.common/pubkeys" \
2054 + "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
2056 +$_VPOLDEK "$SETUP_CONFDIR" -- --update-whole
2057 +poldek.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
2058 +test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"