]> git.pld-linux.org Git - packages/util-vserver.git/blame - util-vserver-pld.patch
- resolve TMPDIR issue; rel 7
[packages/util-vserver.git] / util-vserver-pld.patch
CommitLineData
909684f7 1--- util-vserver-0.30.212.org/distrib/Makefile.am 2006-12-09 17:15:33.000000000 +0100
2d225a2e 2+++ util-vserver-0.30.212/distrib/Makefile.am 2007-02-04 19:00:38.703238500 +0100
893c90d5 3@@ -65,7 +65,9 @@
4 suse91/rpm/macros \
5 gentoo/init-vserver.sh gentoo/net.vserver \
6 gentoo/reboot.sh gentoo/shutdown.sh \
7- etch/vserver-config.sh
8+ etch/vserver-config.sh pld-ac/pkgs/01 pld-ac/rpm/macros \
909684f7
AM
9+ pld-ac/rpmlist.d/00.lst \
10+ pld-th/pkgs/01 pld-th/rpm/macros pld-th/rpmlist.d/00.lst
e7229914
JR
11
12 nobase_confdistrib_DATA = rh9/apt/sources.list \
13 fc1/apt/sources.list \
909684f7 14@@ -67,7 +69,18 @@
4fadbbef 15 fc4/apt/sources.list \
fe9ea50c 16 fc5/apt/sources.list \
17 fc6/apt/sources.list \
4fadbbef
JR
18- suse91/apt/sources.list
19+ suse91/apt/sources.list \
20+ pld-ac/poldek/aliases.conf \
21+ pld-ac/poldek/fetch.conf \
22+ pld-ac/poldek/pld-source.conf \
23+ pld-ac/poldek/poldek.conf \
909684f7
AM
24+ pld-ac/poldek/source.conf \
25+ pld-th/poldek/aliases.conf \
26+ pld-th/poldek/fetch.conf \
27+ pld-th/poldek/pld-source.conf \
28+ pld-th/poldek/poldek.conf \
29+ pld-th/poldek/source.conf
fe9ea50c 30+
4fadbbef
JR
31
32 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
33 = $(nobase_distrib_SCRIPTS)
2d225a2e 34@@ -87,6 +100,9 @@
e7229914
JR
35 ln -sf ../redhat/initpost $(DESTDIR)$(distribdir)/$$i/ && \
36 ln -sf ../redhat/initpre $(DESTDIR)$(distribdir)/$$i/; \
37 done
4fadbbef
JR
38+ POLDEKARCH=$(shell rpm -E '%{_target_cpu}' 2>/dev/null); \
39+ if [ -z "$$POLDEKARCH" ] ; then POLDEKARCH=$(shell uname -m) ; fi ; \
2d225a2e 40+ sed -i -e "s|%ARCH%|$$POLDEKARCH|g" $(DESTDIR)$(confdistribdir)/pld-*/poldek/pld-source.conf
e7229914
JR
41 $(mkinstalldirs) $(DESTDIR)$(confdir) \
42 $(DESTDIR)$(confdistribdir)/.common/pubkeys \
43 $(DESTDIR)$(confdefaultsdir) \
909684f7
AM
44--- util-vserver-0.30.212.org/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100
45+++ util-vserver-0.30.212/distrib/pld-ac/pkgs/01 2007-02-04 18:20:38.633243500 +0100
34158836 46@@ -0,0 +1,5 @@
452506e7 47+basesystem
e7229914 48+glibc
4e5a2018 49+issue
f5f1d176 50+rpm-base
34158836 51+vserver-packages
909684f7
AM
52--- util-vserver-0.30.212.org/distrib/pld-ac/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100
53+++ util-vserver-0.30.212/distrib/pld-ac/poldek/aliases.conf 2007-02-04 18:20:38.637243750 +0100
4fadbbef
JR
54@@ -0,0 +1,30 @@
55+# System wide aliases
56+# ls
57+ll = ls -l
58+llu = ls -lu
59+llU = ls -lU
60+lli = ls -lI
61+
62+# install
63+freshen = install -FN
64+upgrade = install -F
65+
66+# for backward compatybility, greedy is on by default now
67+greedy-upgrade = install -FG
68+
69+just-install = install -IN
70+
71+# search
72+what-requires = search -r
73+what-provides = search -p
74+rsearch = search --perlre
75+
76+exit = quit
77+
78+# for fun
79+#ls = uninstall kernel
80+
81+less = !less
82+grep = !grep
83+awk = !awk
84+
909684f7
AM
85--- util-vserver-0.30.212.org/distrib/pld-ac/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100
86+++ util-vserver-0.30.212/distrib/pld-ac/poldek/fetch.conf 2007-02-04 18:20:38.637243750 +0100
4fadbbef
JR
87@@ -0,0 +1,62 @@
88+# Configuration of poldek external file getters. Each [fetcher] section
89+# declares one external downloader. The syntax is:
90+# [fetcher]
91+# name = NAME
92+# proto = PROTOCOL[ ,PROTOCOL... ]
93+# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO
94+# Possible parameters are:
95+#
96+#[fetcher]
97+# Unique name of the fetcher. This is an optional parameter, if not set then
98+# name is taken from the "cmd" parameter value as "$(basename $cmd)".
99+#name = foo
100+
101+# Protocol or protocols supported by fetcher. Name of the protocol can be
102+# completely arbitrary, i.e. if you can handle protocol "foo" by writing
103+# a script which takes URLs in form 'foo://'.
104+#proto = foo,bar
105+
106+# Parameter specifies an external command and its invoking syntax.
107+# The syntax of "cmd" is:
108+# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n]
109+# Where COMMAND is the name or full path of command, OPTION is command specific
110+# options. Macro '%d' is replaced with cache directory, '%D' is replaced with
111+# 'cache directory/file basename', and '%p' with file basename, %P with file full
112+# path (URL). Optional suffix 'n' with %p and %P means that command can be
113+# invoked with multiple files at once.
114+#cmd = foogetter.sh -N %D %Pn
115+
116+##Configured fetchers
117+[fetcher]
118+proto = cdrom
119+cmd = vfjuggle %d %Pn
120+
121+[fetcher]
122+proto = http,ftp,https
123+cmd = wget -N --dot-style=binary -P %d %Pn
124+
125+[fetcher]
126+proto = http,ftp
127+cmd = snarf %P %D
128+
129+[fetcher]
130+proto = https
131+cmd = curl %P -o %D
132+
133+[fetcher]
134+proto = rsync
135+cmd = rsync -v %P %d
136+
137+[fetcher]
138+proto = smb
139+cmd = vfsmb -v %P %d
140+
141+#[fetcher]
142+#proto = ssh
143+#cmd = vfssh.sh %d %Pn
144+
145+#[fetcher]
146+#proto = foo
147+#cmd = foo.sh %d %Pn
148+
149+
909684f7
AM
150--- util-vserver-0.30.212.org/distrib/pld-ac/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100
151+++ util-vserver-0.30.212/distrib/pld-ac/poldek/pld-source.conf 2007-02-04 18:20:38.637243750 +0100
7eb65750 152@@ -0,0 +1,44 @@
4fadbbef
JR
153+# $Id$
154+# PLD <http://www.pld-linux.org/>
155+
156+_pld_arch = %ARCH%
157+_pld_prefix = ftp://ftp.ac.pld-linux.org/dists/ac
158+## Some mirrors
159+## You can use them if you have better connection there
160+# CI TASK:
161+#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/ac
162+
163+
164+_ac_idxtype = pndir
165+
166+# PLD 2.0 (Ac)
167+[source]
168+type = %{_ac_idxtype}
169+name = ac
170+path = %{_pld_prefix}/PLD/%{_pld_arch}/PLD/RPMS/
7eb65750 171+#signed = yes
4fadbbef
JR
172+
173+[source]
174+type = %{_ac_idxtype}
7eb65750
ER
175+name = ac-updates
176+path = %{_pld_prefix}/updates/%{_pld_arch}/
177+#signed = yes
4fadbbef
JR
178+
179+[source]
180+type = %{_ac_idxtype}
181+name = ac-supported
182+path = %{_pld_prefix}/supported/%{_pld_arch}/
183+noauto = yes
7eb65750 184+#signed = yes
4fadbbef
JR
185+
186+[source]
187+type = %{_ac_idxtype}
188+name = ac-ready
189+path = %{_pld_prefix}/ready/%{_pld_arch}/
190+noauto = yes
191+
192+[source]
193+type = %{_ac_idxtype}
194+name = ac-test
195+path = %{_pld_prefix}/test/%{_pld_arch}/
196+noauto = yes
909684f7
AM
197--- util-vserver-0.30.212.org/distrib/pld-ac/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100
198+++ util-vserver-0.30.212/distrib/pld-ac/poldek/poldek.conf 2007-02-04 18:20:38.637243750 +0100
199@@ -0,0 +1,182 @@
200+# poldek main configuration file.
201+
202+# Some macros. Macros are local, they are not visible in included files
203+# and macros declared in them are not visible to includer.
204+# Macros names starts with underscore '_'.
205+#
206+_distro = pld
207+
208+# Both local and remote files may be included. Included files may not contain
209+# [global] section, it will be ignored anyway.
210+%include %{_distro}-source.conf
211+
212+# local sources
213+%include source.conf
214+
215+# External downloaders configuration, not necessary in most cases, cause
216+# to internal HTTP and FTP client.
217+#%include fetch.conf
218+
219+[global]
220+
221+
222+# This parameter allows to configure the default repository index type.
223+#default index type = pndir
224+
225+# Cache directory for downloaded files. NOTE: that parent directory of cachedir
226+# must exists.
227+#cachedir = $HOME/.poldek-cache
228+
229+# Switch to ordinary user at startup when executed by root
230+#runas = poldek
231+
232+# Permits using root privileges for installation only. Automatically turned
233+# on when poldek executed as ordinary user.
234+#use sudo = no
235+
236+# Load /etc/apt/sources.list.
237+#load apt sources list = no
238+
239+# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2).
240+# This option is a workaround for broken zlib linked into librpm; with enabled
241+# 'auto zlib in rpm' poldek tries to detect such case and then enables external
242+# *.gz handling automatically.
243+#vfile external compress = no
244+
245+# Auto detection of zlib linked into librpm. See 'vfile external compress'
246+# description.
247+#auto zlib in rpm = yes
248+
249+# Automatically download whole index if incremental update fails.
250+#autoupa = yes
251+
252+# Do not save given paths into created indexes. This option may significantly
253+# reduce index size. Example (notice missing starting '/'):
254+# exclude path = usr/share/doc:usr/share/man:usr/src
255+#exclude path =
256+
257+# Full path name to a PM (rpm for now) binary.
258+#pm command = /bin/rpm
259+
260+# Full path name to sudo binary.
261+#sudo command = /usr/bin/sudo
262+
263+
264+### File downloaders configuration
265+
266+# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default
267+# 'poldek@znienacka.net' is sent)
268+#vfile ftp sysuser as anon passwd = no
269+
270+# File getters configuration parameter. By this option URL handlers may be configured.
271+# To get file from HTTP and FTP servers poldek uses its internal client (what is
272+# recommended), although it can be changedby this option. Others protocols handled
273+# by external utilities can be configured also. The syntax is:
274+# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME
275+
276+# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch]
277+# sections (placed in fetch.conf in default configuration).
278+# Examples:
279+# default fetcher = ftp,http:internal
280+# default fetcher = https:wget
281+# default fetcher = cdrom:vfjuggle
282+# vfjuggle is a cdrom getter supplied with poldek.
283+#default fetcher = http,ftp: internal
284+
285+# Proxies for internal FTP and HTTP client may be configured in usual
286+# way, by environment variables ftp_proxy and http_proxy, or by this option.
287+# Its syntax is similar to "default fetcher" one:
288+# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL
289+# Example:
290+# proxy = http: http://w3cache.foo.org:8080
291+#proxy =
292+
293+# Comma separated list of hosts or domains which will not be accessed via proxy.
294+# Option overrides no_proxy environment variable.
295+# Example:
296+# noproxy = localhost, .pl, ftp.foo.bar.org
297+#noproxy =
298+
299+# Internal HTTP and FTP client is stubborn, it retries to retrive
300+# file if connection breaks. This option tells it how many times
301+# it should try.
302+#vfile retries = 128
303+
304+
305+### Installation options
306+
307+# Install packages in small groups instead of doing all-or-nothing
308+# installations.
309+particle install = no
310+
311+# Do not remove downloaded packages after its successful installation.
312+#keep downloads = no
313+
314+# Controls visibility of multiple package instances with different EVR.
315+# If on, only one, highest version will be visible.
316+#unique package names = no
317+
318+# Epoch autopromotion during dependency comparision. RPM specific.
319+# Set it up if you are using system with rpm prior to 4.2.1 version.
320+#promoteepoch = no
321+
322+# Confirm packages installation.
323+#confirm installation = no
324+
325+# Confirm packages removal.
326+#confirm removal = yes
327+
328+# Let the user select package among equivalents.
329+choose equivalents manually = yes
330+
331+# Prevent package listed from being upgraded if they are already installed.
332+# hold = kernel* dev
333+#hold =
334+
335+# Ignore package list - packages fits given mask will be invisible.
336+# ignore = *-smp-* foo*
337+ignore = kernel* udev devfs
338+
339+# Conflicts with already installed packages are treated as resolved
340+# if at least one of multiple-installed package satisfies conflict.
341+# rpm doesn't support such cases, so --pm-nodeps is needed (use with
342+# care).
343+#allow duplicates = yes
344+
345+
346+### RPM specific options
347+
348+# rpm macros can be set by this option. Examples:
349+# rpmdef = _install_langs pl:pl_PL:lt:lt_LT
350+# Do not install any documentation:
351+# rpmdef = _netsharedpath /usr/share/info:/usr/share/man
352+# rpmdef = _excludedocs 1
353+#rpmdef =
354+
355+
356+### Dependency processing settings
357+# Subtle dependency processing options, they should not be changed
358+# unless you know what you are doing
359+
360+# Automatically install packages required by installed ones.
361+#follow = yes
362+
363+# Greedy upgrades, i.e. upgrade packages which dependencies are broken
364+# by being uninstalled ones.
365+#greedy = yes
366+
367+# Be yet more greedy; if successor of orphaned package found, and this
368+# successor drags no packages then upgrade the package instead of process
369+# its dependencies. Option value is implied by 'greedy' one by defalut.
370+#aggressive greedy = yes
371+
372+# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g.
373+# package A requires capability foo &gt;= 1.0 while package B provides "foo"
374+# without any version. Use with care, it may cause weird dependency errors.
375+#mercy = no
376+
377+# Taking into account package Obsoletes.
378+#obsoletes = yes
379+
380+# Taking into account package Conflicts.
381+#conflicts = yes
909684f7
AM
382--- util-vserver-0.30.212.org/distrib/pld-ac/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100
383+++ util-vserver-0.30.212/distrib/pld-ac/poldek/source.conf 2007-02-04 18:20:38.637243750 +0100
384@@ -0,0 +1,85 @@
385+# Sample poldek sources configuration
386+# Every source is configured in his own [source] section.
387+# Possible parameters are:
388+#
389+#[source]
390+# Unique name of the repository.
391+#name = foo
392+
393+# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum'
394+# and 'dir' as listed by --stl switch.
395+#type = pndir
396+
397+# This parameter sets index original type i.e type of repository
398+# from what this repository is created. Default is 'dir' - means
399+# that directory of packages is scanned.
400+#original type = dir
401+
402+# Unique name of the repository. May be either path or URL.
403+#path = /some/url/or/dir
404+
405+# If package index and packages are stored in different locations then
406+# prefix stands for packages path.
407+#prefix = /some/url/or/dir
408+
409+# Controls visibility of multiple package instances with different EVR.
410+# If on, only one, highest version will be visible.
411+#douniq = no
412+
413+# Repository priority. If the same packages (equal names and EVR)
414+# are available in more than one source then package from highest
415+# prioritized source are taken. Priority is numeric value. Lower number
416+# means higher priority, and negative priorities are allowed.
417+# Priority is numeric value.
418+#pri = 0
419+
420+# Controling if repository index will be implicit loaded. Set it off if
421+# the index should be loaded on demand only, i.e. if specified directly
422+# by --sn option.
423+#auto = yes
424+
425+# Controls if repository index will be implicit updated. Set it off if
426+# the index should be updated on demand only, i.e. if specified directly
427+# by --sn option.
428+#autoup = yes
429+
430+# Packages PGP/GPG signatures (if any) will be verified before their
431+# installation.
432+#signed = no
433+
434+# Have the same meaning as [global] parameter. Example:
435+# hold = kernel* dev
436+#hold =
437+
438+# Have the same meaning as [global] parameter. Example:
439+# ignore = kernel*smp* dev
440+#ignore =
441+
442+# Parameter have the same meaning as [global] parameter.
443+# exclude path = usr/share/doc:usr/share/man:usr/src
444+#exclude path =
445+
446+# Preferred language of package descriptions. If not set, taken from locale
447+# settings. Example:
448+# lang = pl_PL:lt_LT
449+#lang =
450+
451+[source]
452+name = home
453+type = dir
454+path = $HOME/rpm/RPMS
455+auto = no
456+autoup = no
457+
458+#[source]
459+#type = pndir
460+#name = foo
461+#path = ftp://ftp.foo.bar.org/RPMS/
462+#pri = -10
463+#auto = no
464+#autoup = no
465+#signed = yes
466+#hold = kernel*
467+#ignore = kernel*-smp-*
468+#dscr = pl_PL
469+
909684f7
AM
470--- util-vserver-0.30.212.org/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100
471+++ util-vserver-0.30.212/distrib/pld-ac/rpm/macros 2007-02-04 18:20:38.637243750 +0100
472@@ -0,0 +1,4 @@
473+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
474+# you have to use at least one language beside 'C'
475+%_install_langs C:en:pl
476+%_netsharedpath /dev
909684f7
AM
477--- util-vserver-0.30.212.org/distrib/pld-ac/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100
478+++ util-vserver-0.30.212/distrib/pld-ac/rpmlist.d/00.lst 2007-02-04 18:20:38.637243750 +0100
479@@ -0,0 +1,10 @@
480+basesystem-*.rpm
481+dev-*.rpm
482+FHS-*.rpm
483+glibc-misc-*.rpm
484+glibc-[0-9]*.rpm
485+libgcc-[0-9]*.rpm
486+setup-*.rpm
487+issue-[0-9]*.rpm
488+rpm-base-*.rpm
489+vserver-packages-*.rpm
909684f7
AM
490--- util-vserver-0.30.212.org/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100
491+++ util-vserver-0.30.212/distrib/pld-th/pkgs/01 2007-02-04 18:20:38.633243000 +0100
492@@ -0,0 +1,5 @@
493+basesystem
494+glibc
495+issue
496+rpm-base
497+vserver-packages
909684f7
AM
498--- util-vserver-0.30.212.org/distrib/pld-th/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100
499+++ util-vserver-0.30.212/distrib/pld-th/poldek/aliases.conf 2007-02-04 18:20:38.637243000 +0100
500@@ -0,0 +1,30 @@
501+# System wide aliases
502+# ls
503+ll = ls -l
504+llu = ls -lu
505+llU = ls -lU
506+lli = ls -lI
507+
508+# install
509+freshen = install -FN
510+upgrade = install -F
511+
512+# for backward compatybility, greedy is on by default now
513+greedy-upgrade = install -FG
514+
515+just-install = install -IN
516+
517+# search
518+what-requires = search -r
519+what-provides = search -p
520+rsearch = search --perlre
521+
522+exit = quit
523+
524+# for fun
525+#ls = uninstall kernel
526+
527+less = !less
528+grep = !grep
529+awk = !awk
530+
909684f7
AM
531--- util-vserver-0.30.212.org/distrib/pld-th/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100
532+++ util-vserver-0.30.212/distrib/pld-th/poldek/fetch.conf 2007-02-04 18:20:38.637243000 +0100
533@@ -0,0 +1,62 @@
534+# Configuration of poldek external file getters. Each [fetcher] section
535+# declares one external downloader. The syntax is:
536+# [fetcher]
537+# name = NAME
538+# proto = PROTOCOL[ ,PROTOCOL... ]
539+# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO
540+# Possible parameters are:
541+#
542+#[fetcher]
543+# Unique name of the fetcher. This is an optional parameter, if not set then
544+# name is taken from the "cmd" parameter value as "$(basename $cmd)".
545+#name = foo
546+
547+# Protocol or protocols supported by fetcher. Name of the protocol can be
548+# completely arbitrary, i.e. if you can handle protocol "foo" by writing
549+# a script which takes URLs in form 'foo://'.
550+#proto = foo,bar
551+
552+# Parameter specifies an external command and its invoking syntax.
553+# The syntax of "cmd" is:
554+# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n]
555+# Where COMMAND is the name or full path of command, OPTION is command specific
556+# options. Macro '%d' is replaced with cache directory, '%D' is replaced with
557+# 'cache directory/file basename', and '%p' with file basename, %P with file full
558+# path (URL). Optional suffix 'n' with %p and %P means that command can be
559+# invoked with multiple files at once.
560+#cmd = foogetter.sh -N %D %Pn
561+
562+##Configured fetchers
563+[fetcher]
564+proto = cdrom
565+cmd = vfjuggle %d %Pn
566+
567+[fetcher]
568+proto = http,ftp,https
569+cmd = wget -N --dot-style=binary -P %d %Pn
570+
571+[fetcher]
572+proto = http,ftp
573+cmd = snarf %P %D
574+
575+[fetcher]
576+proto = https
577+cmd = curl %P -o %D
578+
579+[fetcher]
580+proto = rsync
581+cmd = rsync -v %P %d
582+
583+[fetcher]
584+proto = smb
585+cmd = vfsmb -v %P %d
586+
587+#[fetcher]
588+#proto = ssh
589+#cmd = vfssh.sh %d %Pn
590+
591+#[fetcher]
592+#proto = foo
593+#cmd = foo.sh %d %Pn
594+
595+
909684f7
AM
596--- util-vserver-0.30.212.org/distrib/pld-th/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100
597+++ util-vserver-0.30.212/distrib/pld-th/poldek/pld-source.conf 2007-02-04 18:25:33.175651250 +0100
598@@ -0,0 +1,51 @@
599+# PLD <http://www.pld-linux.org/>
600+
601+_pld_arch = %ARCH%
602+_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th
603+## Some mirrors
604+## You can use them if you have better connection there
605+# CI TASK:
606+#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/th
607+
608+
609+_th_idxtype = pndir
610+
611+# PLD 3.0 (Th)
612+[source]
613+type = %{_th_idxtype}
614+name = th
615+path = %{_pld_prefix}/PLD/%{_pld_arch}/RPMS/
616+
617+[source]
618+type = %{_th_idxtype}
619+name = th
620+path = %{_pld_prefix}/PLD/noarch/RPMS/
621+
622+[source]
623+type = %{_th_idxtype}
624+name = th-updates-security
625+path = %{_pld_prefix}/updates-security/%{_pld_arch}/RPMS/
626+
627+[source]
628+type = %{_th_idxtype}
629+name = th-updates-general
630+path = %{_pld_prefix}/updates-general/%{_pld_arch}/RPMS/
631+noauto = yes
632+
633+#[source]
634+#type = %{_th_idxtype}
635+#name = th-supported
636+#path = %{_pld_prefix}/supported/%{_pld_arch}/RPMS/
637+#noauto = yes
638+
639+[source]
640+type = %{_th_idxtype}
641+name = th-ready
642+path = %{_pld_prefix}/ready/%{_pld_arch}/RPMS/
643+noauto = yes
644+
645+[source]
646+type = %{_th_idxtype}
647+name = th-test
648+path = %{_pld_prefix}/test/%{_pld_arch}/RPMS/
649+noauto = yes
909684f7
AM
650--- util-vserver-0.30.212.org/distrib/pld-th/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100
651+++ util-vserver-0.30.212/distrib/pld-th/poldek/poldek.conf 2007-02-04 18:20:38.637243000 +0100
4fadbbef
JR
652@@ -0,0 +1,182 @@
653+# poldek main configuration file.
654+
655+# Some macros. Macros are local, they are not visible in included files
656+# and macros declared in them are not visible to includer.
657+# Macros names starts with underscore '_'.
658+#
659+_distro = pld
660+
661+# Both local and remote files may be included. Included files may not contain
662+# [global] section, it will be ignored anyway.
663+%include %{_distro}-source.conf
664+
665+# local sources
666+%include source.conf
667+
668+# External downloaders configuration, not necessary in most cases, cause
669+# to internal HTTP and FTP client.
670+#%include fetch.conf
671+
672+[global]
673+
674+
675+# This parameter allows to configure the default repository index type.
676+#default index type = pndir
677+
678+# Cache directory for downloaded files. NOTE: that parent directory of cachedir
679+# must exists.
680+#cachedir = $HOME/.poldek-cache
681+
682+# Switch to ordinary user at startup when executed by root
683+#runas = poldek
684+
685+# Permits using root privileges for installation only. Automatically turned
686+# on when poldek executed as ordinary user.
687+#use sudo = no
688+
689+# Load /etc/apt/sources.list.
690+#load apt sources list = no
691+
692+# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2).
693+# This option is a workaround for broken zlib linked into librpm; with enabled
694+# 'auto zlib in rpm' poldek tries to detect such case and then enables external
695+# *.gz handling automatically.
696+#vfile external compress = no
697+
698+# Auto detection of zlib linked into librpm. See 'vfile external compress'
699+# description.
700+#auto zlib in rpm = yes
701+
702+# Automatically download whole index if incremental update fails.
703+#autoupa = yes
704+
705+# Do not save given paths into created indexes. This option may significantly
706+# reduce index size. Example (notice missing starting '/'):
707+# exclude path = usr/share/doc:usr/share/man:usr/src
708+#exclude path =
709+
710+# Full path name to a PM (rpm for now) binary.
711+#pm command = /bin/rpm
712+
713+# Full path name to sudo binary.
714+#sudo command = /usr/bin/sudo
715+
716+
717+### File downloaders configuration
718+
719+# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default
720+# 'poldek@znienacka.net' is sent)
721+#vfile ftp sysuser as anon passwd = no
722+
723+# File getters configuration parameter. By this option URL handlers may be configured.
724+# To get file from HTTP and FTP servers poldek uses its internal client (what is
725+# recommended), although it can be changedby this option. Others protocols handled
726+# by external utilities can be configured also. The syntax is:
727+# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME
728+
729+# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch]
730+# sections (placed in fetch.conf in default configuration).
731+# Examples:
732+# default fetcher = ftp,http:internal
733+# default fetcher = https:wget
734+# default fetcher = cdrom:vfjuggle
735+# vfjuggle is a cdrom getter supplied with poldek.
736+#default fetcher = http,ftp: internal
737+
738+# Proxies for internal FTP and HTTP client may be configured in usual
739+# way, by environment variables ftp_proxy and http_proxy, or by this option.
740+# Its syntax is similar to "default fetcher" one:
741+# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL
742+# Example:
743+# proxy = http: http://w3cache.foo.org:8080
744+#proxy =
745+
746+# Comma separated list of hosts or domains which will not be accessed via proxy.
747+# Option overrides no_proxy environment variable.
748+# Example:
749+# noproxy = localhost, .pl, ftp.foo.bar.org
750+#noproxy =
751+
752+# Internal HTTP and FTP client is stubborn, it retries to retrive
753+# file if connection breaks. This option tells it how many times
754+# it should try.
755+#vfile retries = 128
756+
757+
758+### Installation options
759+
760+# Install packages in small groups instead of doing all-or-nothing
761+# installations.
762+particle install = no
763+
764+# Do not remove downloaded packages after its successful installation.
765+#keep downloads = no
766+
767+# Controls visibility of multiple package instances with different EVR.
768+# If on, only one, highest version will be visible.
769+#unique package names = no
770+
771+# Epoch autopromotion during dependency comparision. RPM specific.
772+# Set it up if you are using system with rpm prior to 4.2.1 version.
773+#promoteepoch = no
774+
775+# Confirm packages installation.
776+#confirm installation = no
777+
778+# Confirm packages removal.
779+#confirm removal = yes
780+
781+# Let the user select package among equivalents.
cc65018c 782+choose equivalents manually = yes
4fadbbef
JR
783+
784+# Prevent package listed from being upgraded if they are already installed.
785+# hold = kernel* dev
786+#hold =
787+
788+# Ignore package list - packages fits given mask will be invisible.
789+# ignore = *-smp-* foo*
790+ignore = kernel* udev devfs
791+
792+# Conflicts with already installed packages are treated as resolved
793+# if at least one of multiple-installed package satisfies conflict.
794+# rpm doesn't support such cases, so --pm-nodeps is needed (use with
795+# care).
796+#allow duplicates = yes
797+
798+
799+### RPM specific options
800+
801+# rpm macros can be set by this option. Examples:
802+# rpmdef = _install_langs pl:pl_PL:lt:lt_LT
803+# Do not install any documentation:
804+# rpmdef = _netsharedpath /usr/share/info:/usr/share/man
805+# rpmdef = _excludedocs 1
806+#rpmdef =
807+
808+
809+### Dependency processing settings
810+# Subtle dependency processing options, they should not be changed
811+# unless you know what you are doing
812+
813+# Automatically install packages required by installed ones.
814+#follow = yes
815+
816+# Greedy upgrades, i.e. upgrade packages which dependencies are broken
817+# by being uninstalled ones.
818+#greedy = yes
819+
820+# Be yet more greedy; if successor of orphaned package found, and this
821+# successor drags no packages then upgrade the package instead of process
822+# its dependencies. Option value is implied by 'greedy' one by defalut.
823+#aggressive greedy = yes
824+
825+# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g.
826+# package A requires capability foo &gt;= 1.0 while package B provides "foo"
827+# without any version. Use with care, it may cause weird dependency errors.
828+#mercy = no
829+
830+# Taking into account package Obsoletes.
831+#obsoletes = yes
832+
833+# Taking into account package Conflicts.
834+#conflicts = yes
909684f7
AM
835--- util-vserver-0.30.212.org/distrib/pld-th/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100
836+++ util-vserver-0.30.212/distrib/pld-th/poldek/source.conf 2007-02-04 18:20:38.637243000 +0100
4fadbbef
JR
837@@ -0,0 +1,85 @@
838+# Sample poldek sources configuration
839+# Every source is configured in his own [source] section.
840+# Possible parameters are:
841+#
842+#[source]
843+# Unique name of the repository.
844+#name = foo
845+
846+# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum'
847+# and 'dir' as listed by --stl switch.
848+#type = pndir
849+
850+# This parameter sets index original type i.e type of repository
851+# from what this repository is created. Default is 'dir' - means
852+# that directory of packages is scanned.
853+#original type = dir
854+
855+# Unique name of the repository. May be either path or URL.
856+#path = /some/url/or/dir
857+
858+# If package index and packages are stored in different locations then
859+# prefix stands for packages path.
860+#prefix = /some/url/or/dir
861+
862+# Controls visibility of multiple package instances with different EVR.
863+# If on, only one, highest version will be visible.
864+#douniq = no
865+
866+# Repository priority. If the same packages (equal names and EVR)
867+# are available in more than one source then package from highest
868+# prioritized source are taken. Priority is numeric value. Lower number
869+# means higher priority, and negative priorities are allowed.
870+# Priority is numeric value.
871+#pri = 0
872+
873+# Controling if repository index will be implicit loaded. Set it off if
874+# the index should be loaded on demand only, i.e. if specified directly
875+# by --sn option.
876+#auto = yes
877+
878+# Controls if repository index will be implicit updated. Set it off if
879+# the index should be updated on demand only, i.e. if specified directly
880+# by --sn option.
881+#autoup = yes
882+
883+# Packages PGP/GPG signatures (if any) will be verified before their
884+# installation.
885+#signed = no
886+
887+# Have the same meaning as [global] parameter. Example:
888+# hold = kernel* dev
889+#hold =
890+
891+# Have the same meaning as [global] parameter. Example:
892+# ignore = kernel*smp* dev
893+#ignore =
894+
895+# Parameter have the same meaning as [global] parameter.
896+# exclude path = usr/share/doc:usr/share/man:usr/src
897+#exclude path =
898+
899+# Preferred language of package descriptions. If not set, taken from locale
900+# settings. Example:
901+# lang = pl_PL:lt_LT
902+#lang =
903+
904+[source]
905+name = home
906+type = dir
907+path = $HOME/rpm/RPMS
908+auto = no
909+autoup = no
910+
911+#[source]
912+#type = pndir
913+#name = foo
914+#path = ftp://ftp.foo.bar.org/RPMS/
915+#pri = -10
916+#auto = no
917+#autoup = no
918+#signed = yes
919+#hold = kernel*
920+#ignore = kernel*-smp-*
921+#dscr = pl_PL
922+
909684f7
AM
923--- util-vserver-0.30.212.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100
924+++ util-vserver-0.30.212/distrib/pld-th/rpm/macros 2007-02-04 18:20:38.637243000 +0100
d7090917 925@@ -0,0 +1,4 @@
e7229914
JR
926+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
927+# you have to use at least one language beside 'C'
928+%_install_langs C:en:pl
d7090917 929+%_netsharedpath /dev
909684f7
AM
930--- util-vserver-0.30.212.org/distrib/pld-th/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100
931+++ util-vserver-0.30.212/distrib/pld-th/rpmlist.d/00.lst 2007-02-04 18:20:38.637243000 +0100
34158836 932@@ -0,0 +1,10 @@
452506e7
JR
933+basesystem-*.rpm
934+dev-*.rpm
e7229914
JR
935+FHS-*.rpm
936+glibc-misc-*.rpm
937+glibc-[0-9]*.rpm
938+libgcc-[0-9]*.rpm
939+setup-*.rpm
4e5a2018 940+issue-[0-9]*.rpm
f5f1d176 941+rpm-base-*.rpm
34158836 942+vserver-packages-*.rpm
909684f7
AM
943--- util-vserver-0.30.212.org/scripts/functions 2006-12-09 17:15:24.000000000 +0100
944+++ util-vserver-0.30.212/scripts/functions 2007-02-04 18:20:38.637243750 +0100
945@@ -394,6 +394,20 @@
4fadbbef
JR
946 fi
947 }
948
949+function _pkgSetVarsPoldek
950+{
951+ if test -n "$PKGDIR"; then
952+ findDir POLDEKETCDIR $PKGDIR/poldeketc $PKGDIR/base/poldek/etc /etc/poldek
953+ findDir POLDEKCACHEDIR $PKGDIR/poldek-cache $PKGDIR/base/poldek/cache
954+ else
955+ findDir POLDEKETCDIR "$VDIR"/etc/poldek /etc/poldek
956+ findDir POLDEKCACHEDIR "$VDIR"/var/tmp/poldek-cache
957+ fi
958+
959+ findFile POLDEK_CONFIG "$POLDEKETCDIR"/poldek.conf ""
960+ test -z "$POLDEK_CONFIG" || export POLDEK_CONFIG
961+}
962+
963
964 function _pkgMountBase
965 {
909684f7 966@@ -467,6 +481,7 @@
4fadbbef
JR
967 rpm) _pkgSetVarsRPM;;
968 apt) _pkgSetVarsApt;;
969 yum) _pkgSetVarsYum;;
970+ poldek) _pkgSetVarsPoldek;;
971 *) echo "Unknown packaging flavor" >&2; exit 1;;
972 esac
973 done
909684f7 974@@ -750,6 +765,8 @@
4e5a2018
JR
975 style=redhat
976 elif test -e "$_pgs_vdir"/etc/mandrake-release; then
977 style=mandrake
978+ elif test -e "$_pgs_vdir"/etc/pld-release; then
979+ style=pld
980 elif test -e "$_pgs_vdir"/etc/debian_version; then
981 style=debian
982 elif test -e "$_pgs_vdir"/etc/SuSE-release; then
909684f7 983@@ -817,6 +834,27 @@
4fadbbef
JR
984 test -n "$have_yum" && return 0 || return 1
985 }
986
987+## Usage: pkgmgmt.isPoldekAvailable <cfgdir> <vdir> [<is-internal>]
988+function pkgmgmt.isPoldekAvailable
989+{
990+ local cfgdir="$1"
991+ local vdir="$2"
992+ local is_internal="$3"
993+
994+ local have_poldek i
995+ if test -n "$is_internal"; then
996+ have_poldek=1
997+ test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
998+ else
999+ have_poldek=
1000+ for i in /bin /usr/bin /usr/local/bin; do
1001+ test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
1002+ done
1003+ fi
1004+
1005+ test -n "$have_poldek" && return 0 || return 1
1006+}
1007+
1008
1009 function vshelper.doSanityCheck
1010 {
909684f7
AM
1011--- util-vserver-0.30.212.org/scripts/Makefile-files 2006-12-09 17:15:24.000000000 +0100
1012+++ util-vserver-0.30.212/scripts/Makefile-files 2007-02-04 18:20:38.669245750 +0100
1013@@ -21,6 +21,7 @@
fe9ea50c 1014 scripts/vapt-get-worker \
1015 scripts/vrpm-worker \
1016 scripts/vyum-worker \
1017+ scripts/vpoldek-worker \
1018 scripts/vrpm-preload \
1019 scripts/save_s_context \
1020 scripts/vservers.grabinfo.sh \
909684f7 1021@@ -47,11 +48,13 @@
fe9ea50c 1022 scripts/vserver-build.template \
1023 scripts/vserver-build.rsync \
893c90d5 1024 scripts/vserver-build.clone \
fe9ea50c 1025+ scripts/vserver-build.poldek \
1026 scripts/vserver-build.functions \
1027 scripts/vserver-build.functions.apt \
1028 scripts/vserver-build.functions.rpm \
1029 scripts/vserver-build.functions.pkgmgmt \
1030 scripts/vserver-build.functions.yum \
1031+ scripts/vserver-build.functions.poldek \
1032 scripts/vserver-setup.functions \
1033 scripts/vserver.functions \
1034 scripts/vserver.start \
909684f7 1035@@ -64,6 +67,7 @@
fe9ea50c 1036 scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \
1037 scripts/vapt-get-worker \
1038 scripts/vpkg \
1039+ scripts/vpoldek-worker \
1040 scripts/vrpm-worker \
1041 scripts/vrpm-preload \
1042 scripts/start-vservers \
909684f7 1043@@ -86,6 +90,7 @@
fe9ea50c 1044 scripts_sbin_src_PRGS = scripts/chbind \
1045 scripts/chcontext \
1046 scripts/vapt-get \
1047+ scripts/vpoldek \
1048 scripts/vdispatch-conf \
1049 scripts/vemerge \
1050 scripts/vesync \
909684f7
AM
1051--- util-vserver-0.30.212.org/scripts/pkgmgmt 2006-12-09 17:15:24.000000000 +0100
1052+++ util-vserver-0.30.212/scripts/pkgmgmt 2007-02-04 18:20:38.673246000 +0100
1053@@ -195,7 +195,7 @@
4fadbbef
JR
1054 "
1055
1056 case $2 in
1057- (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}")
1058+ (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}")
1059 hasSubstring "$pkgs" ---rpm--- || {
1060 warning "$ERR
1061 * The vserver does not seem to have the 'rpm' package which is required
909684f7 1062@@ -205,9 +205,9 @@
4fadbbef
JR
1063 ERR=
1064 }
1065
1066- hasSubstring "$pkgs" ---apt--- ---yum--- || {
1067+ hasSubstring "$pkgs" ---apt--- ---yum--- ---poldek--- || {
1068 warning "$ERR
1069-* The vserver does not seem to have a depsolver like 'apt' or 'yum'
1070+* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek'
1071 installed. It is suggested to install such a program before setting
1072 up internal package management."
1073 res=1
909684f7 1074@@ -368,6 +368,131 @@
4fadbbef
JR
1075 fi
1076 }
1077
1078+function processVserver_PLD()
1079+{
1080+ local vserver=$1
1081+ local is_internalize=$2
1082+ local cfgdir
1083+ local i
1084+
1085+ cfgdir=$($_VSERVER_INFO "$vserver" APPDIR pkgmgmt) || \
1086+ cfgdir=$($_VSERVER_INFO "$vserver" APPDIR)/pkgmgmt
1087+
1088+ ## Figure out the environment....
1089+ pkgmgmt.isPoldekAvailable "$cfgdir" "$vdir" "$is_internalize" || have_poldek=
1090+
1091+ local POLDEKETCDIR=
1092+ local POLDEKCACHEDIR=
1093+ local RPMETCDIR=
1094+ local RPMSTATEDIR=
1095+
1096+ ## Create directories and assign variables where configuration
1097+ ## can/will be found on the host
1098+ if test -n "$is_internalize"; then
1099+ verifyInternalPackages "$vserver" RH || test -n "$IS_FORCE" ||
1100+ panic "
1101+Can not continue; use '--force' to override this check"
1102+
1103+ pushd "$vdir" >/dev/null
1104+
1105+ test ! -L var/lib/rpm || {
1106+ $_EXEC_CD /var/lib $_RM rpm &&
1107+ $_EXEC_CD /var/lib $_MKDIR -m755 rpm &&
1108+ $_EXEC_CD /var/lib $_CHOWN rpm:rpm rpm ||
1109+ :
1110+ } </dev/null 2>/dev/null
1111+
1112+ for i in var/tmp/poldek-cache etc/rpm etc/poldek; do
1113+ test -d "$i" ||
1114+ $_EXEC_CD /$(dirname "$i") $_MKDIR -m755 $(basename "$i") || :
1115+ done #2>/dev/null
1116+
1117+ popd >/dev/null
1118+
1119+ if test -n "$have_poldek"; then
1120+ findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /etc/poldek
1121+ fi
1122+
1123+ findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /etc/rpm /
1124+ findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state
1125+ else
1126+ mkdir -m755 -p "$cfgdir"
1127+ local need_base=
1128+
1129+ if test -n "$have_poldek"; then
1130+ findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /
1131+ findDir POLDEKCACHEDIR "$cfgdir"/poldek-cache "$cfgdir"/base/poldek/cache /
1132+
1133+ test "$POLDEKETCDIR" != / || POLDEKETCDIR=$cfgdir/base/poldek/etc
1134+ test "$POLDEKCACHEDIR" != / || POLDEKCACHEDIR=$cfgdir/base/poldek/cache
1135+
1136+ test -d "$cfgdir"/poldeketc -a -d "$cfgdir"/poldek-cache || need_base=1
1137+ fi
1138+
1139+ findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /
1140+ findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state /
1141+
1142+ test "$RPMETCDIR" != / || RPMETCDIR=$cfgdir/base/rpm/etc
1143+ test "$RPMSTATEDIR" != / || RPMSTATEDIR=$cfgdir/base/rpm/state
1144+
1145+ test -d "$cfgdir"/rpmetc -a -d "$cfgdir"/rpmstate || need_base=1
1146+ test ! -e "$cfgdir"/base || need_base=
1147+
1148+ test -z "$need_base" || ln -s "$PKGCFGDIR" "$cfgdir"/base
1149+
1150+ mkdir -m755 -p "$PKGCFGDIR"
1151+ _createDirs "$POLDEKETCDIR" "$POLDEKCACHEDIR" \
1152+ "$RPMETCDIR" "$RPMSTATEDIR"
1153+ fi
1154+
1155+ ## Copy the files...
1156+ if test -n "$is_internalize"; then
1157+ if test -n "$have_poldek"; then
1158+ _copySecure "$vdir" "$POLDEKETCDIR" /etc/poldek
1159+ pushd "$vdir" >/dev/null
1160+ _hashAuto /etc/poldek.conf '/'
1161+ popd >/dev/null
1162+ fi
1163+
1164+ _copySecure "$vdir" "$RPMETCDIR" /etc/rpm
1165+ _copySecure "$vdir" "$RPMSTATEDIR" /var/lib/rpm
1166+
1167+ pushd "$vdir" >/dev/null
1168+ ## remove %_dbpath settings
1169+ _substFile /etc/rpm/macros '/^%_dbpath[ \t].*/D'
1170+ popd >/dev/null
1171+ else
1172+ if test -n "$have_poldek"; then
1173+ _copySecureRev "$vdir" /etc/poldek "$POLDEKETCDIR"
1174+ _unhashAuto "$POLDEKETCDIR"/poldek.conf '/'
1175+ fi
1176+
1177+ _copySecureRev "$vdir" /etc/rpm "$RPMETCDIR"
1178+ _copySecureRev "$vdir" /var/lib/rpm "$RPMSTATEDIR"
1179+
1180+ echo -e "%_dbpath\t\t$rpmdb_mntpoint" >>$RPMETCDIR/macros
1181+ fi
1182+
1183+ ## Cleanups...
1184+ if test -n "$is_internalize"; then
1185+ :
1186+ else
8d5b8ef9 1187+ tmpdir=$($_MKTEMPDIR -p /var/tmp pgmgmt.XXXXXX)
4fadbbef
JR
1188+ trap "$_RM -rf $tmpdir" EXIT
1189+ pushd "$vdir" >/dev/null
1190+ $_EXEC_CD /var/lib $_MV rpm $tmpdir/
1191+ $_EXEC_CD /var/lib $_LN_S "$rpmdb_mntpoint" rpm
1192+ $_RM -rf $tmpdir
1193+ fi
1194+
1195+ ## Finish it...
1196+ if test -n "$is_internalize"; then
1197+ $_TOUCH "$cfgdir"/internal
1198+ else
1199+ $_RM -f "$cfgdir"/internal
1200+ fi
1201+}
1202+
1203 function processVserver_Debian()
1204 {
1205 local vserver=$1
909684f7 1206@@ -417,6 +542,7 @@
4fadbbef
JR
1207
1208 case "$style" in
1209 (redhat|mandrake) processVserver_RH "$vserver" "$IS_INTERNALIZE";;
1210+ (pld) processVserver_PLD "$vserver" "$IS_INTERNALIZE";;
1211 (debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";;
1212 (*)
1213 echo $"Vserver style '$style' is not supported for packagemanagment" >&2
909684f7
AM
1214--- util-vserver-0.30.212.org/scripts/util-vserver-vars.pathsubst 2006-12-09 17:15:24.000000000 +0100
1215+++ util-vserver-0.30.212/scripts/util-vserver-vars.pathsubst 2007-02-04 18:20:38.673246000 +0100
1216@@ -51,6 +51,7 @@
4fadbbef
JR
1217 _LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKGLIBDIR/vserver-build.functions.rpm"
1218 _LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGLIBDIR/vserver-build.functions.yum"
1219 _LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGLIBDIR/vserver-build.functions.pkgmgmt"
1220+_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK="$__PKGLIBDIR/vserver-build.functions.poldek"
1221 _LISTDEVIP="$__LEGACYDIR/listdevip"
1222 _LOCKFILE="$__PKGLIBDIR/lockfile"
1223 _MASK2PREFIX="$__PKGLIBDIR/mask2prefix"
909684f7 1224@@ -99,6 +100,8 @@
4fadbbef
JR
1225 _VUNIFY="$__PKGLIBDIR/vunify"
1226 _VYUM="$__SBINDIR/vyum"
1227 _VYUM_WORKER="$__PKGLIBDIR/vyum-worker"
1228+_VPOLDEK="$__SBINDIR/vpoldek"
1229+_VPOLDEK_WORKER="$__PKGLIBDIR/vpoldek-worker"
1230
1231 _AWK="@AWK@"
fe9ea50c 1232 _BZIP2="@BZIP2@"
909684f7
AM
1233--- util-vserver-0.30.212.org/scripts/vpkg 2006-12-09 17:15:24.000000000 +0100
1234+++ util-vserver-0.30.212/scripts/vpkg 2007-02-04 18:20:38.673246000 +0100
1235@@ -115,6 +115,44 @@
4e5a2018
JR
1236 fi
1237 fi
1238 ;;
1239+ (pld)
1240+ rpm_param=
1241+ poldek_param=
1242+ case "$tag" in
1243+ ## rpm outputs sometimes '(contains no files)', so return
1244+ ## only the valid output
1245+ (get-conffiles)
1246+ rpm_param=( -qac --pipe "$_SED '\!^/!p;d'" );;
1247+ (install)
1248+ rpm_param=( -Uvh "$@" )
1249+ poldek_param=( --install -v "$@" )
1250+ ;;
1251+ esac
1252+
1253+ if test -n "$is_external"; then
1254+ have_poldek=1
1255+ test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
1256+ else
1257+ have_poldek=
1258+ for i in /bin /usr/bin /usr/local/bin; do
1259+ test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
1260+ done
1261+ fi
1262+
1263+ if test -n "$is_external"; then
1264+ if test "$have_poldek" -a "$poldek_param"; then
1265+ cmd=( "$_VPOLDEK" "$vserver" -- "${poldek_param[@]}" )
1266+ else
1267+ cmd=( "$_VRPM" "$vserver" -- "${rpm_param[@]}" )
1268+ fi
1269+ else
1270+ if test "$have_poldek" -a "$poldek_param"; then
1271+ cmd=( "$_VSERVER" --silent "$vserver" exec poldek "${poldek_param[@]}" )
1272+ else
1273+ cmd=( "$_VSERVER" --silent "$vserver" exec rpm "${rpm_param[@]}" )
1274+ fi
1275+ fi
1276+ ;;
1277 (debian)
1278 case "$tag" in
1279 (get-conffiles)
909684f7
AM
1280--- util-vserver-0.30.212.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100
1281+++ util-vserver-0.30.212/scripts/vpoldek 2007-02-04 18:20:38.673246000 +0100
4fadbbef
JR
1282@@ -0,0 +1,96 @@
1283+#! /bin/bash
1284+# $Id$
1285+
1286+# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1287+#
1288+# This program is free software; you can redistribute it and/or modify
1289+# it under the terms of the GNU General Public License as published by
1290+# the Free Software Foundation; version 2 of the License.
1291+#
1292+# This program is distributed in the hope that it will be useful,
1293+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1294+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1295+# GNU General Public License for more details.
1296+#
1297+# You should have received a copy of the GNU General Public License
1298+# along with this program; if not, write to the Free Software
1299+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1300+
1301+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
1302+test -e "$UTIL_VSERVER_VARS" || {
1303+ echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
1304+ exit 1
1305+}
1306+. "$UTIL_VSERVER_VARS"
1307+. "$_LIB_FUNCTIONS"
1308+
1309+
1310+function showHelp()
1311+{
1312+ echo \
1313+$"Usage: $0 <vserver-name>* [--all] -- <params>+
1314+
1315+Report bugs to <$PACKAGE_BUGREPORT>."
1316+ exit 0
1317+}
1318+
1319+function showVersion()
1320+{
1321+ echo \
1322+$"vpoldek $PACKAGE_VERSION -- poldek for vservers
1323+This program is part of $PACKAGE_STRING
1324+
1325+Copyright (C) 2003 Enrico Scholz
1326+This program is free software; you may redistribute it under the terms of
1327+the GNU General Public License. This program has absolutely no warranty."
1328+ exit 0
1329+}
1330+
1331+is_quiet=
1332+declare -a vservers=()
1333+
1334+while test "$#" -ge 1; do
1335+ case "$1" in
1336+ --) shift; break;;
1337+ --help) showHelp $0;;
1338+ --quiet|-q) is_quiet=1 ;;
1339+ --all)
1340+ getAllVservers tmp
1341+ vservers=( "${vservers[@]}" "${tmp[@]}" )
1342+ ;;
1343+ --version)
1344+ showVersion ;;
1345+ *) vservers=( "${vservers[@]}" "$1" )
1346+ esac
1347+ shift
1348+done
1349+
1350+cnt=0
1351+res=255
1352+for i in "${vservers[@]}"; do
1353+ cnt=$[ cnt + 1 ]
1354+
1355+ test -n "$is_quiet" || {
1356+ colorize bold echo -n "vpoldek: operating on vserver "
1357+ colorize bold colorize emph echo "$i"
1358+ xtermTitle "vpoldek: operating on vserver '$i' [$cnt/${#vservers[@]}]"
1359+ }
1360+
1361+ if pkgmgmt.isInternal "$i"; then
1362+ $_VSERVER "$i" exec poldek "$@"
1363+ else
1364+ callInNamespace "$i" \
1365+ "$_VNAMESPACE" --new -- "$_VPOLDEK_WORKER" "$i" "$@"
1366+ fi
1367+ res=$?
1368+
1369+ test $res -eq 0 -o -n "$is_quiet" || {
1370+ colorize error echo -n $"vpoldek failed on vserver '$i' with errorcode $res"
1371+ echo
1372+ }
1373+
1374+ test -n "$is_quiet" || echo
1375+done
1376+
1377+test "$cnt" -ge 0 || echo "No vservers specified" >&2
1378+exit $res
909684f7
AM
1379--- util-vserver-0.30.212.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100
1380+++ util-vserver-0.30.212/scripts/vpoldek-worker 2007-02-04 18:20:38.673246000 +0100
4fadbbef
JR
1381@@ -0,0 +1,45 @@
1382+#! /bin/bash
1383+# $Id$
1384+
1385+# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1386+#
1387+# This program is free software; you can redistribute it and/or modify
1388+# it under the terms of the GNU General Public License as published by
1389+# the Free Software Foundation; version 2 of the License.
1390+#
1391+# This program is distributed in the hope that it will be useful,
1392+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1393+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1394+# GNU General Public License for more details.
1395+#
1396+# You should have received a copy of the GNU General Public License
1397+# along with this program; if not, write to the Free Software
1398+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1399+
1400+set -e
1401+
1402+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
1403+test -e "$UTIL_VSERVER_VARS" || {
1404+ echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
1405+ exit 1
1406+}
1407+. "$UTIL_VSERVER_VARS"
1408+. "$_LIB_FUNCTIONS"
1409+
1410+
1411+vserver="$1"
1412+shift
1413+
1414+pkgInit "$vserver" rpm poldek
1415+
1416+test -z "$_POLDEK" || {
1417+ warning $"The environment variable \$_POLDEK is not supported anymore; please use \$POLDEK instead of"
1418+ ${POLDEK:=$_POLDEK}
1419+}
1420+
1421+exec ${_POLDEK:-poldek} \
1422+ -v --root=$VDIR \
1423+ --cachedir=$POLDEKCACHEDIR \
1424+ --conf=$POLDEK_CONFIG \
1425+ --pmcmd=$RPM_BINARY \
1426+ "$@"
909684f7
AM
1427--- util-vserver-0.30.212.org/scripts/vserver-build 2006-12-09 17:15:24.000000000 +0100
1428+++ util-vserver-0.30.212/scripts/vserver-build 2007-02-04 18:20:38.673246000 +0100
1429@@ -57,6 +57,9 @@
fe9ea50c 1430 yum ... -- -d <distribution>
4fadbbef
JR
1431 ... installs the base-packages of the given distribution with
1432 help of 'vyum'
fe9ea50c 1433+ poldek ... -- -d <distribution>
4fadbbef
JR
1434+ ... installs the base-packages of the given distribution with
1435+ help of 'vpoldek'
fe9ea50c 1436 rpm ... -- [-d <distribution>] --empty|([--force] [--nodeps] <manifest>)+
4fadbbef 1437 ... installs lists of rpm-packages
fe9ea50c 1438 skeleton ... -- [<cmd> <args>*]
909684f7 1439@@ -134,7 +137,7 @@
4fadbbef
JR
1440
1441 case x"$method" in
1442 (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
893c90d5 1443- (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone)
1444+ (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xpoldek)
4fadbbef
JR
1445 . $__PKGLIBDIR/vserver-build.$method
1446 ;;
1447 (x) panic $"No build-method specified";;
909684f7
AM
1448--- util-vserver-0.30.212.org/scripts/vserver-build.functions 2006-12-09 17:15:24.000000000 +0100
1449+++ util-vserver-0.30.212/scripts/vserver-build.functions 2007-02-04 18:20:38.673246000 +0100
1450@@ -167,6 +167,12 @@
fe9ea50c 1451 elif test -e /etc/slackware-version; then
1452 set -- $(cat /etc/slackware-version)
4fadbbef
JR
1453 DISTRIBUTION=slackware$2
1454+ elif test -e /etc/pld-release; then
1455+ old_IFS=$IFS
1456+ IFS='()'
1457+ set -- $(cat /etc/pld-release)
1458+ DISTRIBUTION=pld-$(echo $2 | tr A-Z a-z)
1459+ IFS=$old_IFS
1460 elif test -n "$1"; then
1461 DISTRIBUTION=$1
1462 else
909684f7
AM
1463--- util-vserver-0.30.212.org/scripts/vserver-build.functions.poldek 1970-01-01 01:00:00.000000000 +0100
1464+++ util-vserver-0.30.212/scripts/vserver-build.functions.poldek 2007-02-04 18:20:38.673246000 +0100
4fadbbef
JR
1465@@ -0,0 +1,67 @@
1466+# $Id$ --*- sh -*--
1467+
1468+# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1469+#
1470+# This program is free software; you can redistribute it and/or modify
1471+# it under the terms of the GNU General Public License as published by
1472+# the Free Software Foundation; version 2 of the License.
1473+#
1474+# This program is distributed in the hope that it will be useful,
1475+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1476+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1477+# GNU General Public License for more details.
1478+#
1479+# You should have received a copy of the GNU General Public License
1480+# along with this program; if not, write to the Free Software
1481+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1482+
1483+function poldek.installBasePackages
1484+{
1485+ local name="$1"
1486+ local dir="$2"
1487+
1488+ test "$dir" != / || return 0
1489+ for filelist in "$dir"/*; do
1490+ isRegularFile "$filelist" || continue
1491+ local idx=0
1492+ local can_fail=false
1493+ local flags='--install'
1494+
1495+ set -- $(<$filelist)
1496+ while test "$#" -gt 0; do
1497+ case "$1" in
1498+ --reinstall) flags='--reinstall';;
1499+ --can-fail) can_fail=true;;
1500+ *) break;;
1501+ esac
1502+ shift
1503+ done
1504+ "$_VPOLDEK" "$name" -- $flags $* || $can_fail
1505+ done
1506+}
1507+
1508+function poldek.initVariables
1509+{
1510+ findFile POLDEKCONFDEFAULT \
1511+ "$__CONFDIR/.distributions/$DISTRIBUTION/poldek/poldek.conf" \
1512+ "$__CONFDIR/.defaults/apps/pkgmgmt/poldek/poldek.conf" \
1513+ "$__DISTRIBDIR/$DISTRIBUTION/poldek/poldek.conf" \
1514+ "$__DISTRIBDIR/defaults/poldek/poldek.conf" \
1515+ ''
1516+}
1517+
1518+function poldek.initFilesystem
1519+{
1520+ mkdir -p "$PKGCFGDIR"/poldek/etc
1521+ mkdir -p "$PKGCFGBASE"/poldek-cache
1522+
1523+ $_LN_S "$PKGCFGBASE"/poldek-cache "$PKGCFGDIR"/poldek/cache
1524+
1525+ populateDirectory "$PKGCFGDIR/poldek/etc" \
1526+ "$__DISTRIBDIR/defaults/poldek" \
1527+ "$__DISTRIBDIR/$DISTRIBUTION/poldek" \
1528+ "$__CONFDIR/.distributions/$DISTRIBUTION/poldek"
1529+
78219c44
JR
1530+# test -z "$POLDEKCONFDEFAULT" || \
1531+# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/
4fadbbef 1532+}
909684f7
AM
1533--- util-vserver-0.30.212.org/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100
1534+++ util-vserver-0.30.212/scripts/vserver-build.poldek 2007-02-04 18:20:38.701247750 +0100
4fadbbef
JR
1535@@ -0,0 +1,64 @@
1536+# $Id$ --*- sh -*--
1537+
1538+# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1539+#
1540+# This program is free software; you can redistribute it and/or modify
1541+# it under the terms of the GNU General Public License as published by
1542+# the Free Software Foundation; version 2 of the License.
1543+#
1544+# This program is distributed in the hope that it will be useful,
1545+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1546+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1547+# GNU General Public License for more details.
1548+#
1549+# You should have received a copy of the GNU General Public License
1550+# along with this program; if not, write to the Free Software
1551+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1552+
1553+tmp=$(getopt -o +d: --long debug -n "$0" -- "$@") || exit 1
1554+eval set -- "$tmp"
1555+
1556+. "$_LIB_VSERVER_BUILD_FUNCTIONS_RPM"
1557+. "$_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK"
1558+. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT"
1559+
1560+while true; do
1561+ case "$1" in
1562+ (-d) DISTRIBUTION=$2; shift;;
1563+ (--debug) set -x;;
1564+ (--) shift; break ;;
1565+ (*) echo "vserver-build.poldek: internal error: unrecognized option '$1'" >&2
1566+ exit 1
1567+ ;;
1568+ esac
1569+ shift
1570+done
1571+
1572+getDistribution
1573+
1574+base.init
1575+
1576+pkgmgmt.initVariables
1577+rpm.initVariables
1578+poldek.initVariables
1579+
1580+base.initFilesystem "$OPTION_FORCE"
1581+pkgmgmt.initFilesystem "$OPTION_FORCE"
1582+rpm.initFilesystem
1583+poldek.initFilesystem
1584+
1585+setup_writeOption "$VSERVER_NAME"
1586+setup_writeInitialFstab
1587+
1588+test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
1589+rpm.initDB "$SETUP_CONFDIR"
1590+rpm.importGPGPubKeys "$SETUP_CONFDIR" \
1591+ "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \
1592+ "$__CONFDIR/.distributions/.common/pubkeys" \
1593+ "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
1594+
1595+$_VPOLDEK "$SETUP_CONFDIR" -- --update-whole
1596+poldek.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
1597+test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
1598+
1599+base.setSuccess
This page took 0.240157 seconds and 4 git commands to generate.